From: Corey Tabaka <eieio@google.com>
Date: Thu, 29 Jun 2017 18:50:09 +0000 (+0000)
Subject: Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~245^2~37
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f036493fab7a65939b37b6da9da12bebe574978c;p=android-x86%2Fframeworks-native.git

Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
am: bf72631a10

Change-Id: Ib1f5d7cc4841124c4f5fc1ea543ce3984dc26d16
---

f036493fab7a65939b37b6da9da12bebe574978c