OSDN Git Service

Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
authorRuben Brunk <rubenbrunk@google.com>
Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 Jun 2015 00:04:19 +0000 (00:04 +0000)
1  2 
res/values/strings.xml
src/com/android/settings/fuelgauge/BatteryEntry.java

Simple merge