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