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

Change-Id: Iac0fdf4d9bab026112de4864d227e3894da192ef


Trivial merge