OSDN Git Service

Merge "Make battery labels translatable." into nyc-dev
authorJason Monk <jmonk@google.com>
Mon, 23 May 2016 20:07:08 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 20:07:08 +0000 (20:07 +0000)
commitae8b7259f59eb3208517f6e3558b9ba991f39b96
tree410656d5a25d2e4bc8f8c5b49e3288b93fa402c5
parent809bb0f1957d92e9fc3a84c56573dddd6ce50162
parent14abed66d7a70c3fc8e063246e3f79a0a53dfcd3
Merge "Make battery labels translatable." into nyc-dev
am: 14abed66d7

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

Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9