OSDN Git Service

Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af
authorAdrian Roos <roosa@google.com>
Fri, 7 Jul 2017 17:05:50 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 17:05:50 +0000 (17:05 +0000)
commita33b206e0c019e501553e08c10f305e1d30285fb
treeba4c958172c34d57b67b9132bff78cbfcb583ec7
parenteb6db8d4a98b6e12de84211d3b133575c3a0e7c6
parentcfa37bb121c7f3b4a9da1a5841612c0d502d3d71
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af
am: cfa37bb121

Change-Id: I67430769e05885673c08ac0e9291171d9a86ea4d
res/values/strings.xml