summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Basic library for parsing TLS/SSL ClientHellos in tests."Alex Klyubin2014-11-1312-3/+1208
|\
| * Basic library for parsing TLS/SSL ClientHellos in tests.Alex Klyubin2014-11-1212-3/+1208
* | Merge "JarUtils: fix reference to RFC"Kenny Root2014-11-131-2/+2
|\ \ | |/ |/|
| * JarUtils: fix reference to RFCKenny Root2014-11-131-2/+2
|/
* Merge "Fix OldSocketTest#test_connectLjava_net_SocketAddressI."Elliott Hughes2014-11-123-34/+24
|\
| * Fix OldSocketTest#test_connectLjava_net_SocketAddressI.Elliott Hughes2014-11-113-34/+24
|/
* Merge "Remove workaround for *.clients.google.com hostname verication."Alex Klyubin2014-11-101-4/+1
|\
| * Remove workaround for *.clients.google.com hostname verication.Alex Klyubin2014-11-101-4/+1
* | Merge "Regression test for video/x-matroska."Elliott Hughes2014-11-101-0/+6
|\ \
| * | Regression test for video/x-matroska.Elliott Hughes2014-11-101-0/+6
| |/
* | Merge "Delete unused imtable field"Mathieu Chartier2014-11-101-3/+0
|\ \
| * | Delete unused imtable fieldMathieu Chartier2014-11-101-3/+0
|/ /
* | Merge "Switch order of digest and digest encryption algorithm"Kenny Root2014-11-102-10/+86
|\ \ | |/ |/|
| * Switch order of digest and digest encryption algorithmKenny Root2014-11-072-10/+86
* | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures."Elliott Hughes2014-11-081-36/+15
|\ \ | |/ |/|
| * Fix TimeZoneTest#testPreHistoricOffsets CTS failures.Elliott Hughes2014-11-071-36/+15
|/
* Merge "Changes associated with an OkHttp bad proxy response fix"Neil Fuller2014-11-071-18/+8
|\
| * Changes associated with an OkHttp bad proxy response fixNeil Fuller2014-11-061-18/+8
* | am e4298641: Merge "Fix the Mac build by moving libcore to libc++."Dan Albert2014-11-051-0/+2
|\ \ | |/
| * Merge "Fix the Mac build by moving libcore to libc++."Dan Albert2014-11-051-0/+2
| |\
| | * Fix the Mac build by moving libcore to libc++.Dan Albert2014-11-041-0/+2
| |/
* | resolved conflicts for merge of f9a3c05f to stage-aosp-masterIan Rogers2014-11-0520-49/+46
|\ \ | |/
| * Merge "Move from UniquePtr to std::unique_ptr."Ian Rogers2014-11-0520-49/+46
| |\
| | * Move from UniquePtr to std::unique_ptr.Ian Rogers2014-11-0420-49/+46
* | | am d4d881ff: Merge "SSLSocket: track update to TLS defaults"Kenny Root2014-11-041-6/+8
|\ \ \ | |/ /
| * | Merge "SSLSocket: track update to TLS defaults"Kenny Root2014-11-041-6/+8
| |\ \ | | |/ | |/|
| | * SSLSocket: track update to TLS defaultsKenny Root2014-11-031-6/+8
* | | am ef4d1341: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN."Ian Rogers2014-11-041-7/+0
|\ \ \ | |/ /
| * | Merge "Don't define DISALLOW_COPY_AND_ASSIGN."Ian Rogers2014-11-041-7/+0
| |\ \
| | * | Don't define DISALLOW_COPY_AND_ASSIGN.Ian Rogers2014-11-041-7/+0
| |/ /
* | | am 2b32e9ac: Merge "Use equals for comparing percent strings."Narayan Kamath2014-11-041-1/+1
|\ \ \ | |/ /
| * | Merge "Use equals for comparing percent strings."Narayan Kamath2014-11-041-1/+1
| |\ \
| | * | Use equals for comparing percent strings.Narayan Kamath2014-11-041-1/+1
| |/ /
* | | am 140f3a33: Merge "SSLSocket: document current behavior with SSLContext"Kenny Root2014-11-042-0/+71
|\ \ \ | |/ /
| * | Merge "SSLSocket: document current behavior with SSLContext"Kenny Root2014-11-032-0/+71
| |\ \ | | |/
| | * SSLSocket: document current behavior with SSLContextKenny Root2014-11-032-0/+71
| |/
* | am 1cb912c5: Merge "Disable tzdata in ."Elliott Hughes2014-10-291-2/+1
|\ \ | |/
| * Merge "Disable tzdata in $ANDROID_DATA."Elliott Hughes2014-10-281-2/+1
| |\
| | * Disable tzdata in $ANDROID_DATA.Elliott Hughes2014-10-281-2/+1
| |/
* | am bb23450e: Merge "Allow "_" in URIs."Narayan Kamath2014-10-292-3/+10
|\ \ | |/
| * Merge "Allow "_" in URIs."Narayan Kamath2014-10-282-3/+10
| |\
| | * Allow "_" in URIs.Narayan Kamath2014-10-282-3/+10
| |/
* | am f7ba96dc: Merge "Improve DexFile debugging"Brian Carlstrom2014-10-291-2/+6
|\ \ | |/
| * Merge "Improve DexFile debugging"Brian Carlstrom2014-10-281-2/+6
| |\
| | * Improve DexFile debuggingBrian Carlstrom2014-10-271-2/+6
| |/
* | am be4e0fd0: Merge "Allow 1 ulp difference in test_cbrt_D and test_sinh_D."Elliott Hughes2014-10-281-54/+30
|\ \ | |/
| * Merge "Allow 1 ulp difference in test_cbrt_D and test_sinh_D."Elliott Hughes2014-10-271-54/+30
| |\
| | * Allow 1 ulp difference in test_cbrt_D and test_sinh_D.Elliott Hughes2014-10-251-54/+30
* | | am cf6718b6: Merge "Update tests for HttpURLConnection.disconnect() changes"Neil Fuller2014-10-282-9/+13
|\ \ \ | |/ /
| * | Merge "Update tests for HttpURLConnection.disconnect() changes"Neil Fuller2014-10-272-9/+13
| |\ \ | | |/ | |/|