From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Wed, 5 Jul 2017 21:01:29 +0000 (+0000)
Subject: Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
X-Git-Tag: android-x86-9.0-r1~1029^2^2~8^2^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6fd06712657d00fda4c0fb5ee325b17b14415b02;p=android-x86%2Fframeworks-base.git

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6"
---

6fd06712657d00fda4c0fb5ee325b17b14415b02