| commit | d1b2c6a64a9e431a6234bcba3e1b52e7611db525 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 24 19:00:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 19:00:31 2015 +0000 |
| tree | 6622728be46a3acb68268341710d6049d3fb3aec | |
| parent | 8a54905c91f7538c654ebeeb88847923139290af [diff] | |
| parent | 127fd12480311103cb214740700de08c4ac2b72f [diff] |
am 127fd124: am 32bfb59f: am 5a5a8df9: am a2c2dab0: (-s ours) Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev automerge: 55a3493 * commit '127fd12480311103cb214740700de08c4ac2b72f': DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test