From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 13 Jun 2017 00:29:15 +0000 (+0000)
Subject: Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~1030^2~1134^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9b7be0c3f5aac13fb5acd64b3ec753338d71172c;p=android-x86%2Fframeworks-base.git

Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
am: c14f46b135

Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93
---

9b7be0c3f5aac13fb5acd64b3ec753338d71172c