Jason Monk 909fdc0c8c Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 ...

am: 7143013049

* commit '71430130496299138f1f65875a2162927883412e':
  Make battery labels translatable.

Change-Id: I503c0c66b06e076dfa2ea36f6a14828cbc7c5d6b

2016-05-23 20:07:16 +00:00

..

res

Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7

2016-05-23 20:07:16 +00:00

src/com/android/settingslib

While turning OFF do not honor ON requests. am: 090bf55130

2016-05-19 18:37:34 +00:00

tests

…

Android.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00

AndroidManifest.xml

…

common.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00