OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6c...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)
am: b019e2c469

Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7


Trivial merge