diff options
| author | Steve Block <steveblock@google.com> | 2010-11-09 06:32:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-09 06:32:13 -0800 |
| commit | c55fa1b999068fc7f242b88a87270b249ab366eb (patch) | |
| tree | af5fb645204cb47af5f9d245f882e6318657915b /keystore/java/android/security/SystemKeyStore.java | |
| parent | f7093befbbc64d324b6d4c41e98ae69bbed4cd31 (diff) | |
| parent | ca501d20360ffee3a37fc87538daf8281f8a14ed (diff) | |
Merge changes I650518a4,If15fddac
* changes:
Fix DumpRenderTree2 to not attempt to read expected results over HTTPS
Fix FsUtils.readDataFromUrl() to do the network request on a background thread
Diffstat (limited to 'keystore/java/android/security/SystemKeyStore.java')
0 files changed, 0 insertions, 0 deletions