From: Android Build Merger (Role) <noreply-android-build-merger@google.com>
Date: Thu, 25 Jan 2018 21:56:56 +0000 (+0000)
Subject: Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev
X-Git-Tag: android-x86-9.0-r1~91^2~1^2^2~122
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=939313310b;p=android-x86%2Fframeworks-base.git

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev
am: eb9a92f942

Change-Id: Iecc7a0821c6469d00849c0d25138ebb593e6a438
---

939313310b705328901b37a7b96066bed3849efd