From: Bill Yi <byi@google.com>
Date: Mon, 11 Jun 2018 18:37:03 +0000 (-0700)
Subject: Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=34d73a6f77;p=android-x86%2Fframeworks-base.git

Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev
am: 59f13cbb8a

Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8
---

34d73a6f77e41dde0504a638e767603bdcafbc89