From: Tony Mak <tonymak@google.com>
Date: Mon, 11 Sep 2017 15:12:34 +0000 (+0000)
Subject: resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357... 
X-Git-Tag: android-x86-9.0-r1~385^2~6^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a39e97aaf30ef3774a3a3c6de7ba701f1509b3b3;p=android-x86%2Fframeworks-base.git

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a  -s ours am: 9c358ccbe2  -s ours am: 72bbe1d631  -s ours
am: 77a3aed507  -s ours

Change-Id: Iacfc275c1b1a8262289413a53bee77e5782a2df4
---

a39e97aaf30ef3774a3a3c6de7ba701f1509b3b3