Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Browse Source

am: 44dd4881de  -s ours

Change-Id: Iee04f4f8cec1570edffb2fe69400c5d494903af2

...

This commit is contained in:

Xin Li 2017-11-15 01:27:47 +00:00 committed by android-build-merger

parent fd0011a9bb 44dd4881de

commit b9156758fa

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 Not Available