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 23:29:06 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 23:29:06 +0000 (23:29 +0000)
am: 3393f0ff26

Change-Id: I46a111c138cd7a226e33556ab7ef3bb2dbf00b1a


Trivial merge