summaryrefslogtreecommitdiffstats
path: root/dalvik/src
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-07-24 10:50:52 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-24 10:50:52 -0700
commitbebe134c3f9d0ab0ab7c769edd5788abe1fa7632 (patch)
tree5e186125cab9e7a14366760131c8111f04823a7a /dalvik/src
parent80cfc0dfe417f58499fadf1dee99e5cfc69f4286 (diff)
parentfc1332710b0af3bbe658535a257048cf8c7577f2 (diff)
downloadlibcore-bebe134c3f9d0ab0ab7c769edd5788abe1fa7632.zip
libcore-bebe134c3f9d0ab0ab7c769edd5788abe1fa7632.tar.gz
libcore-bebe134c3f9d0ab0ab7c769edd5788abe1fa7632.tar.bz2
Merge "Fix flakey test_SSLSocket_setSoTimeout_basic by using a full second timeout"
Diffstat (limited to 'dalvik/src')
0 files changed, 0 insertions, 0 deletions