| commit | 55a3493e46a43c7d3e588a5f982910b5851754ad | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 23 19:10:54 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 23 19:10:55 2015 +0000 |
| tree | 661c36eb1ebf82363fc1c2ec7bf244f3a991e440 | |
| parent | 79d97606691599816b99b9fc661d47d79c15969e [diff] | |
| parent | e16d2c436100b6d97f64a1e6a1a97920bfec2c7c [diff] |
Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev