OSDN Git Service

Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)
am: 56fc279b7d

Change-Id: I8be5efd510bfd81097747451ee7adf62e8b36544


Trivial merge