From: Alan Viverette <alanv@google.com>
Date: Thu, 15 Mar 2018 13:32:16 +0000 (+0000)
Subject: Merge "Update for 1.0.0-beta1" into pi-dev
X-Git-Tag: android-x86-9.0-r1~73^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3618f68c01cf40fc2b65a6cc1ff54ca45cf334c0;p=android-x86%2Fpackages-apps-Settings.git

Merge "Update for 1.0.0-beta1" into pi-dev
---

3618f68c01cf40fc2b65a6cc1ff54ca45cf334c0