summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-01 02:20:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 02:20:40 +0000
commite0e8aa1ebca8608ac50f20b3ad069bb95a0e5962 (patch)
tree9ec7090eba50589a60ea00e17c2a75d01ff71053 /core/java/android/security
parent787bacd35a9d53c76f27ba565e5d5d97f86b73fd (diff)
parentc230e1908f6307913e5af644a6594cc0f9f3fb93 (diff)
downloadframeworks_base-e0e8aa1ebca8608ac50f20b3ad069bb95a0e5962.zip
frameworks_base-e0e8aa1ebca8608ac50f20b3ad069bb95a0e5962.tar.gz
frameworks_base-e0e8aa1ebca8608ac50f20b3ad069bb95a0e5962.tar.bz2
am c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit 'c230e1908f6307913e5af644a6594cc0f9f3fb93': Add SecretKeyFactory backed by AndroidKeyStore.
Diffstat (limited to 'core/java/android/security')
0 files changed, 0 insertions, 0 deletions