From: jackqdyulei <jackqdyulei@google.com>
Date: Thu, 4 May 2017 01:28:37 +0000 (+0000)
Subject: Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7
X-Git-Tag: android-x86-9.0-r1~1204^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c3960173846a555bc857f3d0019c655810222bd;p=android-x86%2Fpackages-apps-Settings.git

Merge "Update "Phone idle" subtext" into oc-dev am: 3a1d6db0e7
am: 85950d5ebd

Change-Id: I0d3d67b274242f72fa46c157c7cee883a476a2e2
---

5c3960173846a555bc857f3d0019c655810222bd