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