OSDN Git Service

Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)
commit4c70016a9492aab8e67dad7b321e106078316233
tree9d13300a719c6ae95efcb02798ec4ac9609208be
parentf6b1267780522d9a644641054d5ef42c622e311f
parent4b029f8b0d296346a64a83348053c3f352b03299
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
am: 4b029f8b0d

Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6