am fa08f998: resolved conflicts for merge of de01780f to lmp-mr1-dev-plus-aosp

Browse Source

* commit 'fa08f9986bdf5e939986579c4a4ed47d7b853fac':
  Build dlext_testzip as custom module.
  Add file_offset parameter to android_extinfo

...

This commit is contained in:

Dmitriy Ivanov

2014-10-22 18:20:18 +00:00

committed by Android Git Automerger

parent 5ffe3971e5 fa08f9986b

commit 7dbf52c9df

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available