From: Hansong Zhang <hsz@google.com>
Date: Wed, 28 Mar 2018 01:20:03 +0000 (+0000)
Subject: Merge changes I70eafe03,Ia44e16c5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=464d62791f8818110d6c12c824e0e59937073904;p=android-x86%2Fframeworks-base.git

Merge changes I70eafe03,Ia44e16c5
am: b52f49153c

Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9
---

464d62791f8818110d6c12c824e0e59937073904