From: Adam Lesinski <adamlesinski@google.com>
Date: Wed, 5 Jul 2017 21:27:31 +0000 (+0000)
Subject: Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours... 
X-Git-Tag: android-x86-9.0-r1~1906
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e4f47078cdacb10e65c136ce50249ad5bd654de;p=android-x86%2Fframeworks-base.git

Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours am: 1ebe18d691  -s ours am: 8f09557150  -s ours
am: 036989452d  -s ours

Change-Id: Ife759ebe7c4849d597406bc5f9608cc8a344dc92
---

5e4f47078cdacb10e65c136ce50249ad5bd654de