diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-09 00:56:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 00:56:27 +0000 |
| commit | 33a68a521f77a2070832ece271d1047ecf56de7e (patch) | |
| tree | 3cfe3df58b2c7c396909972c8593b36927135a2f /keystore/java/android/security/KeyStoreParameter.java | |
| parent | 2d81cb6824e186a6c76d0466e2d58eaa34312673 (diff) | |
| parent | 343e291b67432427709a20e97f42fbc329c45c44 (diff) | |
am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '343e291b67432427709a20e97f42fbc329c45c44':
Prevent windows from freezing screen while timeout
Diffstat (limited to 'keystore/java/android/security/KeyStoreParameter.java')
0 files changed, 0 insertions, 0 deletions