summaryrefslogtreecommitdiffstats
path: root/json
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-09-11 18:31:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-11 18:31:20 +0000
commitd74dfe94a850dbe29e5dd533248e768b015d578f (patch)
tree1591ce8b6938e104f2b21cda1ea5b445f363bef9 /json
parent617f22bc24dd2eda57bc73d1c7a6e0ec00a34e52 (diff)
parent8d848927c29aa2c71809435aeea78a3555842566 (diff)
downloadlibcore-d74dfe94a850dbe29e5dd533248e768b015d578f.zip
libcore-d74dfe94a850dbe29e5dd533248e768b015d578f.tar.gz
libcore-d74dfe94a850dbe29e5dd533248e768b015d578f.tar.bz2
am 8d848927: am 82404753: Merge "Suppress ConnectionTest: It uses SPDY, which can cause IllegalStateException" into lmp-dev
* commit '8d848927c29aa2c71809435aeea78a3555842566': Suppress ConnectionTest: It uses SPDY, which can cause IllegalStateException
Diffstat (limited to 'json')
0 files changed, 0 insertions, 0 deletions