diff options
| author | Narayan Kamath <narayan@google.com> | 2014-10-29 17:47:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 17:47:15 +0000 |
| commit | 7192f0d2acafb2599988d463a42a2dcfd80c25bc (patch) | |
| tree | 115fd185e1053914db034b28c89469a5007e3b05 /core/java/android/net/Proxy.java | |
| parent | 955bee89abada8b6541f499c686376d4434242b1 (diff) | |
| parent | b27ea56312692c5ee0f38dad38e2a3832086b40a (diff) | |
| download | frameworks_base-7192f0d2acafb2599988d463a42a2dcfd80c25bc.zip frameworks_base-7192f0d2acafb2599988d463a42a2dcfd80c25bc.tar.gz frameworks_base-7192f0d2acafb2599988d463a42a2dcfd80c25bc.tar.bz2 | |
am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad."
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
Remove tests/SslLoad.
Diffstat (limited to 'core/java/android/net/Proxy.java')
0 files changed, 0 insertions, 0 deletions