diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-09 00:32:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 00:32:45 +0000 |
| commit | 343e291b67432427709a20e97f42fbc329c45c44 (patch) | |
| tree | 013fe1768c6dcee55a97838f95a39066967d38dd /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 2cb1e1dca0ae9d1b34774b16f07974ea56c42cb4 (diff) | |
| parent | e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e (diff) | |
am e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit 'e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
Prevent windows from freezing screen while timeout
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions