From: Sen Jiang <senj@google.com>
Date: Wed, 29 Mar 2017 23:35:44 +0000 (+0000)
Subject: Merge changes Ice70d9ab,Iba7ac028 am: 01320a387b am: 9c290a08e8 am: f1c07f7c66
X-Git-Tag: android-x86-8.1-r1~62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e60b636b8d4e4071a327c9929b3da70755975b2;hp=-c;p=android-x86%2Fsystem-extras.git

Merge changes Ice70d9ab,Iba7ac028 am: 01320a387b am: 9c290a08e8 am: f1c07f7c66
am: 2dd62738b4

Change-Id: Ib805be8cc67f6cbd3a78b47d65ca4655eeb0abe8
---

5e60b636b8d4e4071a327c9929b3da70755975b2