From: Peter Qiu <zqiu@google.com>
Date: Fri, 27 Jan 2017 00:13:28 +0000 (+0000)
Subject: Merge changes If5025361,Iabe27cd8 am: 0a649bffcc am: 0773d2cc0d am: 26bdc1f273
X-Git-Tag: android-x86-8.1-r1~4678^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=60c777dcd226f47faec5e3142bcc4f075219e4f4;p=android-x86%2Fframeworks-base.git

Merge changes If5025361,Iabe27cd8 am: 0a649bffcc am: 0773d2cc0d am: 26bdc1f273
am: e0209c2964

Change-Id: I358ec7c3c5587a3bf692ae5d99be43ea378f7a67
---

60c777dcd226f47faec5e3142bcc4f075219e4f4