diff options
| author | Michael Wright <michaelwr@google.com> | 2015-04-15 11:10:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 11:10:58 +0000 |
| commit | 99e23088843eddede29d0fc5ca30a83f147f31b0 (patch) | |
| tree | f5495a9edd38cd1bbb4c3b0f59deb974493f0cf0 /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 895f3c27269d14ec53ff3ae8526342f9b57a10e1 (diff) | |
| parent | 150e0e87e1faa01f927cfe8c7110ef843612a1df (diff) | |
am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
fix return value scale of notifyANR()
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions