diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-04-16 17:19:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 17:19:42 +0000 |
commit | f18ceefcf0d3cc91e74737e0a93f16775e3bf18b (patch) | |
tree | 2f5ba24e686c0c5b5b4d5854c7e085850c5048bc /keystore/java/android/security/AndroidKeyStore.java | |
parent | 110020229e0a31b060a329dfe55181f98a31e802 (diff) | |
parent | cd6e00c6d973af350f4bb0de5d85fed7e299d9e8 (diff) |
am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit 'cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
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