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:06:35 +0000 (22:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)
am: 98e0930394  -s ours

Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb


Trivial merge