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:51:00 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:51:00 +0000 (21:51 +0000)
am: df6486e37f

Change-Id: Id106d8c3d4e805003eec8f8e9e1eb8c8f681a5a6


Trivial merge