diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-04-16 17:31:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 17:31:34 +0000 |
| commit | 1f3c7f3f500bdbfd790c20872961d84ef617f066 (patch) | |
| tree | 971ade83ddbbdd0361149a238d69d222838c7a4d /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 726466c22517a1dc4d549edfd32fc5447794d29e (diff) | |
| parent | f18ceefcf0d3cc91e74737e0a93f16775e3bf18b (diff) | |
am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
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