From: Tony Mak <tonymak@google.com>
Date: Mon, 11 Sep 2017 14:28:44 +0000 (+0000)
Subject: resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
X-Git-Tag: android-x86-8.1-r1~50^2^2~4^2^2^2~29
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4453c3cda2135da2bbe2fc7efd0b1a5a2b796144;p=android-x86%2Fframeworks-base.git

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
am: 68cce397b3

Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
---

4453c3cda2135da2bbe2fc7efd0b1a5a2b796144