From: Hugo Benichi <hugobenichi@google.com>
Date: Wed, 11 Jan 2017 01:34:23 +0000 (+0000)
Subject: Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4 am: 22e7d2ed20
X-Git-Tag: android-x86-8.1-r1~2121^2~876
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93287d99ddf7a3ee5e15893a30273f785b5fda58;p=android-x86%2Fframeworks-base.git

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4 am: 22e7d2ed20
am: 994978461f

Change-Id: Id4b45a161e8b2d6b077bc27bd7ab797a308fea29
---

93287d99ddf7a3ee5e15893a30273f785b5fda58