OSDN Git Service

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

Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0


Trivial merge