summaryrefslogtreecommitdiffstats
path: root/core/java/android/security/keymaster
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-06-19 01:40:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-19 01:40:39 +0000
commita353528c79e0e295a98a79f8672ace6df8647f78 (patch)
tree5014ed2aded0f4815e28142f33d5656db7583a02 /core/java/android/security/keymaster
parent8b156e37d5238487f1b3742fe9fb8a0632bfd66c (diff)
parent3122fa85b2f18c0a89f5fe1ef0942c530a271843 (diff)
downloadframeworks_base-a353528c79e0e295a98a79f8672ace6df8647f78.zip
frameworks_base-a353528c79e0e295a98a79f8672ace6df8647f78.tar.gz
frameworks_base-a353528c79e0e295a98a79f8672ace6df8647f78.tar.bz2
Merge "Added a message to the keyguard bouncer" into mnc-dev
Diffstat (limited to 'core/java/android/security/keymaster')
0 files changed, 0 insertions, 0 deletions