diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-04-16 17:12:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 17:12:45 +0000 |
| commit | cd6e00c6d973af350f4bb0de5d85fed7e299d9e8 (patch) | |
| tree | 096e55885b1d140d6be040c0630438d38c9b53ed /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d (diff) | |
| parent | 54862febaf519281ac61ebe31caf49c69820449a (diff) | |
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
* changes:
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