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)
commit2b57d28b4ca938ab37fe941b7520cce99aaf6f65
tree76e2592ab1cbc2c1a2c3e6232ba501d41fbd3a29
parentdf6486e37fa9f198af41e0de032246e5c4257780
parent4607ec8f6d3c8aa37dc70826bd93428ef28c1cc6
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1 am: ccbac7e9e0  -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd  -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212  -s ours
am: 4607ec8f6d

Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36