OSDN Git Service

Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 00:34:06 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:34:06 +0000 (00:34 +0000)
am: 762dc30ad5

Change-Id: I6fa6eff5ec93a0f4a1b8c6e99a36c874f9bb1757


Trivial merge