Jason Monk 7143013049 Merge "Make battery labels translatable." into nyc-dev ...

am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
  Make battery labels translatable.

Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633

2016-05-23 20:03:51 +00:00

..

res

Merge "Make battery labels translatable." into nyc-dev

2016-05-23 20:03:51 +00:00

src/com/android/settingslib

While turning OFF do not honor ON requests.

2016-05-19 18:32:24 +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