From: Phil Weaver <pweaver@google.com>
Date: Tue, 18 Jul 2017 21:51:00 +0000 (+0000)
Subject: Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5... 
X-Git-Tag: android-x86-9.0-r1~1030^2~59
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e344a25184a10f56c99659cee45b8257155543a1;p=android-x86%2Fframeworks-base.git

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c  -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018 am: 3700014be0
am: df6486e37f

Change-Id: Id106d8c3d4e805003eec8f8e9e1eb8c8f681a5a6
---

e344a25184a10f56c99659cee45b8257155543a1