OSDN Git Service

Merge "Update battery strings" into pi-dev
authorLei Yu <jackqdyulei@google.com>
Fri, 30 Mar 2018 19:12:41 +0000 (19:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Mar 2018 19:12:41 +0000 (19:12 +0000)
commit7bbc11e87d8506d14c0a7c680ba5c6f13e6a713f
tree0f63fc11568462012ec3035f563754a7906fe02b
parent93b5d0d3f025805e35ba3be71ec024a13312625d
parent1050c49cd2c76ac3ecba305b7e7a5a04cb2d4320
Merge "Update battery strings" into pi-dev
res/values/strings.xml
tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java