summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-06-23 10:26:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-23 10:26:38 -0700
commit0ff6d7ee17de33d314ef726e7506b39c64a3ed35 (patch)
tree2cd045b94d4fe7bf8e707457cc63523ea8d80ab6 /media/java
parent5ecc4601ea2672e1e52bcd0860908d1cae7db4c2 (diff)
parentac8a1b21986f06d0e54ddebb1e4962de23eb77ea (diff)
downloadframeworks_base-0ff6d7ee17de33d314ef726e7506b39c64a3ed35.zip
frameworks_base-0ff6d7ee17de33d314ef726e7506b39c64a3ed35.tar.gz
frameworks_base-0ff6d7ee17de33d314ef726e7506b39c64a3ed35.tar.bz2
Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)"
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions