From: Mihai Popa <popam@google.com>
Date: Wed, 6 Jun 2018 19:45:38 +0000 (-0700)
Subject: [automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=564fecfdb7;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into oc-dev am: 3fce74a7f3  -s ours am: bb18c011aa  -s ours am: 7478894a89  -s ours
am: 999d9e1bf0  -s ours

Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f
---

564fecfdb78b05d1cfb29ae6c5954cc539006256