From: fionaxu <fionaxu@google.com>
Date: Fri, 15 Sep 2017 20:52:04 +0000 (-0700)
Subject: resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
X-Git-Tag: android-x86-8.1-r1~64^2~2^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e40562a7388a33372b6244462aa86aabaa966c2;p=android-x86%2Fframeworks-base.git

resolve merge conflicts of 6df58d8da10d to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
---

6e40562a7388a33372b6244462aa86aabaa966c2