| commit | 500c43f230dca789c7e52489d2297c7b146af19a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 24 22:52:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 22:52:07 2015 +0000 |
| tree | 2c559414b4991a139b41f61a963a1dfcfc24a32b | |
| parent | 781f5e25bb35c6d842accd6c00c021fe26eaef2a [diff] | |
| parent | d1b2c6a64a9e431a6234bcba3e1b52e7611db525 [diff] |
am d1b2c6a6: am 127fd124: am 32bfb59f: am 5a5a8df9: am a2c2dab0: (-s ours) Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev automerge: 55a3493 * commit 'd1b2c6a64a9e431a6234bcba3e1b52e7611db525': DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test