summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2015-02-24 04:54:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-24 04:54:34 +0000
commit7d0c22e21b00b339204f0004f5075f088b19cbaa (patch)
treec3671eab536d17b0485e0b296e0f063821d3b81f /keystore
parenta13ca400d17750321ac66f6362d7467a3f21d845 (diff)
parent3576ca1f9bd1e46101ad940cc5923ac9965cfafe (diff)
downloadframeworks_base-7d0c22e21b00b339204f0004f5075f088b19cbaa.zip
frameworks_base-7d0c22e21b00b339204f0004f5075f088b19cbaa.tar.gz
frameworks_base-7d0c22e21b00b339204f0004f5075f088b19cbaa.tar.bz2
am 3576ca1f: am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '3576ca1f9bd1e46101ad940cc5923ac9965cfafe': Add Keymaster 0.4 binder API
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions