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:19:08 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)
commitbb12830bf9742d8b6408be31bac8fe9bf036f031
tree17616f997e610a79bb4f4e0e24faf0bc30953879
parent9a1b4eb21f17eb0195f02156a0187bcaad007e2b
parentb72ffa47a45ff35c5b0775c9f22d87698bd7aa7a
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4
am: b72ffa47a4  -s ours

Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00