resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp

Browse Source

am: dfa91739a6  -s ours

Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87

...

This commit is contained in:

Lorenzo Colitti

2017-04-14 17:02:27 +00:00

committed by android-build-merger

parent b3a669b8f8 dfa91739a6

commit d8bc4cd22a

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