From: Chalard Jean <jchalard@google.com>
Date: Tue, 22 Jan 2019 23:20:30 +0000 (-0800)
Subject: Merge changes If71fadd2,I42047185 am: 022daeb874
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5da014a5fb32044a070ad83e1e908b8260ad5480;p=android-x86%2Fframeworks-base.git

Merge changes If71fadd2,I42047185 am: 022daeb874
am: 6d1da29090

Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d
---

5da014a5fb32044a070ad83e1e908b8260ad5480