OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3


Trivial merge