summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/BatteryStats.java
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-06-05 23:53:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 23:53:46 +0000
commit772ca6cf2a72f9cbf6e5dbe8693112638f3b5481 (patch)
tree870edb031ae6ba13a371a35873ffb9664bb06958 /core/java/android/os/BatteryStats.java
parent97c699e2bd6169f867311bd40b25801432e78f68 (diff)
parentcfbca74bfa8a74fbd7242a9ccd33b73a862aeed9 (diff)
downloadframeworks_base-772ca6cf2a72f9cbf6e5dbe8693112638f3b5481.zip
frameworks_base-772ca6cf2a72f9cbf6e5dbe8693112638f3b5481.tar.gz
frameworks_base-772ca6cf2a72f9cbf6e5dbe8693112638f3b5481.tar.bz2
Merge "Update SMS permission description string" into mnc-dev
Diffstat (limited to 'core/java/android/os/BatteryStats.java')
0 files changed, 0 insertions, 0 deletions