summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-09-01 20:20:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 20:20:36 +0000
commit8067adb075997f7d81eb051eebc14c011fb1c53a (patch)
tree3c33a58425b68749714b711ef240fa05104b5a17
parenta09098d764d7298da6657fc08add46da2fee4711 (diff)
parent7b62f2d19e186f5143ee2d6800467aa5f5dafd6e (diff)
downloadlibcore-8067adb075997f7d81eb051eebc14c011fb1c53a.zip
libcore-8067adb075997f7d81eb051eebc14c011fb1c53a.tar.gz
libcore-8067adb075997f7d81eb051eebc14c011fb1c53a.tar.bz2
am 7b62f2d1: am fc3762eb: am 2cb494ee: am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev
* commit '7b62f2d19e186f5143ee2d6800467aa5f5dafd6e':
0 files changed, 0 insertions, 0 deletions