OSDN Git Service

Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev am: e7ee805c6a
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:01:12 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:01:12 +0000 (01:01 +0000)
am: 59a69e5ef8

Change-Id: I7470e33ffb8d120ed5cd56dcfa479c886b5d3426


Trivial merge