OSDN Git Service

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 21:46:25 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:46:25 +0000 (21:46 +0000)
am: 3700014be0

Change-Id: Ib0ab12f33da6a6a6f245fa4f2eab949becf42798


Trivial merge