OSDN Git Service

Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)
commitf6b1267780522d9a644641054d5ef42c622e311f
tree9d13300a719c6ae95efcb02798ec4ac9609208be
parent4a40ef7688832564545dc8ca459a4118dec191a0
parent9d889600a91f57267d4e9c668e2d9e23fce0ea49
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours
am: 9d889600a9

Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f