OSDN Git Service

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

Change-Id: I6e6b155d703d3377ed710f8a03658b2c6338a2b1


Trivial merge