From: Phil Weaver <pweaver@google.com>
Date: Tue, 18 Jul 2017 22:01:45 +0000 (+0000)
Subject: DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1... 
X-Git-Tag: android-x86-8.1-r1~88^2~1^2^2~10^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de5281dee95e978e8119838d7add002f5676563b;p=android-x86%2Fframeworks-base.git

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: Iac0fdf4d9bab026112de4864d227e3894da192ef
---

de5281dee95e978e8119838d7add002f5676563b