diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-07 17:59:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 17:59:53 +0000 |
| commit | 5c86c1f3e914a281284802e1c6ef7e5392f55768 (patch) | |
| tree | 660911ba7662ebd2dd8d544bd1f909af79dea71d /keystore/java/android/security/KeyStoreParameter.java | |
| parent | 9581c4bc2cbb0ab07ddd8282ae3a88cceb2d9d83 (diff) | |
| parent | e97118c84d0a093ee2eb6adbcb45841c0f3bf8db (diff) | |
am e97118c8: am bde7e467: am d229f442: Merge "Add a timeout state to frozen windows"
* commit 'e97118c84d0a093ee2eb6adbcb45841c0f3bf8db':
Add a timeout state to frozen windows
Diffstat (limited to 'keystore/java/android/security/KeyStoreParameter.java')
0 files changed, 0 insertions, 0 deletions