summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-10-13 22:55:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-13 22:55:11 +0000
commit4673b259bc1b362fee206c7476c5fde3f53b4e20 (patch)
tree2e5e37e0859f168d7eb9ceb0f58e4c1f1e6c9e07 /core/java/android/security
parent50e796326a39cd15af9031a41e3fe30b1f0f35f6 (diff)
parentf142cac73478aa2d8abb44449d244eedd0bfb62f (diff)
downloadframeworks_base-4673b259bc1b362fee206c7476c5fde3f53b4e20.zip
frameworks_base-4673b259bc1b362fee206c7476c5fde3f53b4e20.tar.gz
frameworks_base-4673b259bc1b362fee206c7476c5fde3f53b4e20.tar.bz2
Merge "Show charging speed in all locales" into mnc-dr-dev
Diffstat (limited to 'core/java/android/security')
0 files changed, 0 insertions, 0 deletions