From: Hugo Benichi <hugobenichi@google.com>
Date: Thu, 14 Sep 2017 12:01:19 +0000 (+0000)
Subject: Merge changes Ie2676b20,Ie8db6f85
X-Git-Tag: android-x86-9.0-r1~348^2~1^2~3^2~152
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4188432a7bb065608cf950a2f7602cb4fb8c338b;p=android-x86%2Fframeworks-base.git

Merge changes Ie2676b20,Ie8db6f85
am: 61901ddedd

Change-Id: Ib4fab32418da8274bd6b5cb9fef85e0db79d866a
---

4188432a7bb065608cf950a2f7602cb4fb8c338b