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

Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36


Trivial merge