| commit | c670c673dae711f8b1758bc140dd822b392effa1 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed May 28 10:34:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 10:34:50 2014 +0000 |
| tree | 3a2c205b5ebcc24c28e306b3c6d1a93bb0f40273 | |
| parent | ec629db86302432d8f731d17f67f2e48e879e220 [diff] | |
| parent | ddfd859719048c50cf247125af436391a4fff742 [diff] |
am ddfd8597: Merge "Fix NetworkOnMainThreadException in KeyStoreTest" * commit 'ddfd859719048c50cf247125af436391a4fff742': Fix NetworkOnMainThreadException in KeyStoreTest