tree 7ae3f1b38be3806b9932256dd78e938ab733a3d2
parent 0e64deba84ea16abf6790b767e1e84e67b3eca1f
parent 55a3493e46a43c7d3e588a5f982910b5851754ad
author Daniel Xie <dxie@google.com> 1435086723 +0000
committer android-build-merger <android-build-merger@google.com> 1435086723 +0000

Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev
automerge: 55a3493

* commit '55a3493e46a43c7d3e588a5f982910b5851754ad':
  DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test