resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp

Browse source

am: 9a73da9161  -s ours

Change-Id: I8583b1e0bf0d01d3eedc3526b5b2870a40f16523

...

This commit is contained in:

sqian 2017-08-02 01:43:03 +00:00 committed by android-build-merger

parent 183d5af38d 9a73da9161

commit 0014284e43

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available