Merge "Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 am: 7143013049" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-23 20:07:57 +00:00
committed by Android (Google) Code Review

View File

@@ -809,7 +809,8 @@
<!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] --> <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->
<string name="home">Settings Home</string> <string name="home">Settings Home</string>
<string-array name="battery_labels" translatable="false"> <!-- Labels on the side of batter graph in Quick Settings and Settings [CHAR LIMIT=8] -->
<string-array name="battery_labels">
<item>0%</item> <item>0%</item>
<item>50%</item> <item>50%</item>
<item>100%</item> <item>100%</item>