summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-04-16 17:55:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 17:55:03 +0000
commit186fe7b10f475fdccb3bcab19461bd2900347b71 (patch)
tree3b14a7a232b294133d39dc0c3003c53ac3e2071a /keystore/java/android/security/AndroidKeyStore.java
parent81d0aabcb5af11f8695793dbfac893d17688970e (diff)
parentc4affce9df0817b84df3e61c3932f53b77ee0986 (diff)
am c4affce9: am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit 'c4affce9df0817b84df3e61c3932f53b77ee0986': Update golden image for tests. Update to using LayoutlibCallback. Remove implementation of deprecated method. Add @empty support.
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions