summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/KeyChainAliasCallback.java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-11-16 10:37:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-16 10:37:23 -0800
commitb3272d297bb45e5cd3201766baef4fef7921ce05 (patch)
treeb91c4f6166c731ec0a559af50ddec6ea0afabfe1 /keystore/java/android/security/KeyChainAliasCallback.java
parenta962ef2993099e6c5db3809a7e829e43c8cf084a (diff)
parentde8c5ec88982b836b2c50d4f685f4e05b29bdd0d (diff)
downloadframeworks_base-b3272d297bb45e5cd3201766baef4fef7921ce05.zip
frameworks_base-b3272d297bb45e5cd3201766baef4fef7921ce05.tar.gz
frameworks_base-b3272d297bb45e5cd3201766baef4fef7921ce05.tar.bz2
am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit 'de8c5ec88982b836b2c50d4f685f4e05b29bdd0d': IME action (done, next...) correctly handled
Diffstat (limited to 'keystore/java/android/security/KeyChainAliasCallback.java')
0 files changed, 0 insertions, 0 deletions