summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-04-28 00:36:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 00:36:23 +0000
commitd602d23fd81d7b70d76c596d9b0ae7a4cfd98e02 (patch)
tree3c60cda4e9729c371f046e77182c7bf333920e1a /keystore/java/android/security/AndroidKeyStore.java
parent43429656ff8762416571661c591691aeb9cebdbd (diff)
parent80d19484c109c4beb0e36b7ce0418ebe526ad300 (diff)
am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '80d19484c109c4beb0e36b7ce0418ebe526ad300': docs: Update Wearable API setup to mention addApiIfAvailable().
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions