diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 19:54:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 19:54:15 -0700 |
| commit | f8355d5489a52dcdd904afb48c0f170886becdae (patch) | |
| tree | b19cbcc6cb9d94bf2d2cf6cf6c592892cb64bd98 /keystore/java/android/security/KeyChain.java | |
| parent | 2221e34ba539c3dea16f48659afaf100ca0c477f (diff) | |
| parent | bc533dd3201afdcf421070cc47250dd7471b77aa (diff) | |
| download | frameworks_base-f8355d5489a52dcdd904afb48c0f170886becdae.zip frameworks_base-f8355d5489a52dcdd904afb48c0f170886becdae.tar.gz frameworks_base-f8355d5489a52dcdd904afb48c0f170886becdae.tar.bz2 | |
am bc533dd3: (-s ours) am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit 'bc533dd3201afdcf421070cc47250dd7471b77aa':
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions