Merge \"Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667 -s ours am: 2703570242 am: 2263a64eb8\" into nyc-mr1-dev-plus-aosp

Browse Source

am: 767b482697  -s ours

Change-Id: I6f34f765a99bbc84e5db0eac118bf3a214f20fae

...

This commit is contained in:

Jason Monk

2016-07-15 14:17:01 +00:00

committed by android-build-merger

parent 2f5d9d6cef 767b482697

commit af250e18c2

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