From: Dan Stoza <stoza@google.com>
Date: Fri, 14 Jul 2017 20:45:47 +0000 (+0000)
Subject: Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~245^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1042a22877c8c38b50c0c656d8c02f50b996f7a7;p=android-x86%2Fframeworks-native.git

Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev
am: 607b5d1b40

Change-Id: I51b25a25bae1517f64edf9ce072244addd1b3544
---

1042a22877c8c38b50c0c656d8c02f50b996f7a7