OSDN Git Service

Merge "Add TtsSpan for formatted time." into oc-dev
authorLei Yu <jackqdyulei@google.com>
Mon, 24 Apr 2017 17:01:58 +0000 (17:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Apr 2017 17:01:59 +0000 (17:01 +0000)
commit8f9f25c541c9ac6aa62fcebcd803656192b85f7e
tree260edbf90a591d02ab01bd5aa4b0bdc123ae7d61
parentbcaabec9252fa9af2d6d62ec8d1d54b2e5471a37
parentf4c1cef322f2c747b606ba0d78563bbb0e887c51
Merge "Add TtsSpan for formatted time." into oc-dev
res/values/strings.xml
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
src/com/android/settings/fuelgauge/PowerUsageSummary.java
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java