OSDN Git Service

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)
am: ccbac7e9e0  -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37


Trivial merge