OSDN Git Service

Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am: 1ae521df6a -s ours
authorFelipe Leme <felipeal@google.com>
Sat, 20 Aug 2016 04:09:49 +0000 (04:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 Aug 2016 04:09:49 +0000 (04:09 +0000)
am: 7d13fe76be  -s ours

Change-Id: I7c12b1dac9a3a441fa18ed29bdc335d2e12f9355


Trivial merge