OSDN Git Service

Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev am: bc819e604f
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:04:07 +0000 (01:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:04:07 +0000 (01:04 +0000)
am: c10534685a

Change-Id: Ic2422dc76f17c623cecbacd935a0b465910c5c2d


Trivial merge