OSDN Git Service

Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev am: bc819e604f am: c10534685a
authorAndrew Solovay <asolovay@google.com>
Fri, 29 Jul 2016 01:53:11 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 01:53:11 +0000 (01:53 +0000)
am: e745b5018a

Change-Id: Ic5406ea1ec43f7443efa5c0055c682a65f4f7fca


Trivial merge