From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Tue, 25 Apr 2017 18:49:21 +0000 (+0000)
Subject: Merge "resolve merge conflicts of a2b0b7381c7e to master"
X-Git-Tag: android-x86-8.1-r1~543
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=46ab3c5510dd8d900d93478f0990c5013e0fb4e9;p=android-x86%2Fframeworks-base.git

Merge "resolve merge conflicts of a2b0b7381c7e to master"
---

46ab3c5510dd8d900d93478f0990c5013e0fb4e9