From: Dan Willemsen <dwillemsen@google.com>
Date: Sun, 10 Sep 2017 01:44:06 +0000 (+0000)
Subject: Merge changes I93cf24d4,I32e438ef
X-Git-Tag: android-x86-9.0-r1~348^2~1^2~3^2~173
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c28d591b36;p=android-x86%2Fframeworks-base.git

Merge changes I93cf24d4,I32e438ef
am: 30798ad13a

Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
---

c28d591b36556a6109a1bbf8a2fc51a28aa46d9c