OSDN Git Service

DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
authorPhil Weaver <pweaver@google.com>
Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8


Trivial merge