OSDN Git Service

Merge "Make battery labels translatable." into nyc-dev
authorJason Monk <jmonk@google.com>
Mon, 23 May 2016 20:03:51 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 20:03:51 +0000 (20:03 +0000)
commit71430130496299138f1f65875a2162927883412e
tree13f64c515ffad100504d29240b91ffb0f7994fe6
parent7f2654042655d32714cc59fd857f24fc7b284f77
parent14abed66d7a70c3fc8e063246e3f79a0a53dfcd3
Merge "Make battery labels translatable." into nyc-dev
am: 14abed66d7

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

Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633