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

Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
This commit is contained in:
Phil Weaver
2017-07-18 21:14:49 +00:00
committed by android-build-merger

Diff Content Not Available