summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-07-14 19:31:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 19:31:47 +0000
commita2231a754b92eb79e4b667c8b40fd0390ebb6dfb (patch)
treec718568c2486982f1a146d79c4797992f9cc370b /keystore
parent779e5e0ed8489fe6faad35a061a82ad07618b5b3 (diff)
parent9c013a211768c661f1142aba31c690daa76c66f7 (diff)
downloadframeworks_base-a2231a754b92eb79e4b667c8b40fd0390ebb6dfb.zip
frameworks_base-a2231a754b92eb79e4b667c8b40fd0390ebb6dfb.tar.gz
frameworks_base-a2231a754b92eb79e4b667c8b40fd0390ebb6dfb.tar.bz2
am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '9c013a211768c661f1142aba31c690daa76c66f7': Show charging speed on Keyguard
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions