OSDN Git Service

Merge changes from topic \'PHENOMENAL_CHANGE\' into nyc-mr1-dev
authorMathieu Chartier <mathieuc@google.com>
Tue, 21 Jun 2016 01:25:54 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 01:25:54 +0000 (01:25 +0000)
am: a6eb11d1bc  -s ours

Change-Id: Ib053ff6b0139971d0737f39b811de2014d3dd174


Trivial merge