summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add a test for bug 71369"Neil Fuller2014-06-171-0/+15
|\
| * Add a test for bug 71369Neil Fuller2014-06-171-0/+15
* | Merge "Tidy up MulticastSocketTest and fix execution on hammerhead"Neil Fuller2014-06-101-340/+307
|\ \
| * | Tidy up MulticastSocketTest and fix execution on hammerheadNeil Fuller2014-06-111-340/+307
* | | Merge "Pass BCP-47 tags and not Locale.toString results to ICU."Narayan Kamath2014-06-1022-289/+511
|\ \ \
| * | | Pass BCP-47 tags and not Locale.toString results to ICU.Elliott Hughes2014-06-1622-289/+511
| | |/ | |/|
* | | Merge "Fix bogus define checks and a typo."Narayan Kamath2014-06-102-10/+37
|\ \ \ | |/ / |/| |
| * | Fix bogus define checks and a typo.Narayan Kamath2014-06-132-10/+37
|/ /
* | Merge "Remove unnecessary loop in uloc_forLanguageTag."Narayan Kamath2014-06-101-15/+15
|\ \
| * | Remove unnecessary loop in uloc_forLanguageTag.Narayan Kamath2014-06-121-15/+15
* | | Merge "Implement Locale.toLanguageTag without ICU support."Narayan Kamath2014-06-104-73/+256
|\ \ \ | |/ /
| * | Implement Locale.toLanguageTag without ICU support.Narayan Kamath2014-06-124-73/+256
|/ /
* | Merge "Extract non-API locale tests into a separate test class."Narayan Kamath2014-06-102-106/+129
|\ \
| * | Extract non-API locale tests into a separate test class.Narayan Kamath2014-06-112-106/+129
* | | Merge "Fix Mac build."Ian Rogers2014-06-102-1/+7
|\ \ \
| * | | Fix Mac build.Ian Rogers2014-06-102-1/+7
|/ / /
* | | Merge "Tests for Runtime.*Memory()"Neil Fuller2014-06-102-39/+23
|\ \ \
| * | | Tests for Runtime.*Memory()Neil Fuller2014-06-102-39/+23
| | |/ | |/|
* | | Merge "Fix DatagramMulticastChannelTest so it works better on hammerhead"Neil Fuller2014-06-101-345/+392
|\ \ \
| * | | Fix DatagramMulticastChannelTest so it works better on hammerheadNeil Fuller2014-06-101-345/+392
| |/ /
* | | Merge "Build fix."Ian Rogers2014-06-102-1/+3
|\ \ \
| * | | Build fix.Ian Rogers2014-06-092-1/+3
|/ / /
* | | Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-107-76/+133
|\ \ \ | |/ / |/| |
| * | Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-097-76/+133
* | | Merge "Shard the _getInstance test and skip the DH tests."Neil Fuller2014-06-092-55/+70
|\ \ \ | |/ / |/| |
| * | Shard the _getInstance test and skip the DH tests.Neil Fuller2014-06-092-55/+70
|/ /
* | Merge "Improve the load/loadLibrary documentation."Elliott Hughes2014-06-062-57/+42
|\ \ | |/ |/|
| * Improve the load/loadLibrary documentation.Elliott Hughes2014-06-062-57/+42
|/
* Merge "Suppress large test that always times-out"Neil Fuller2014-06-041-0/+5
|\
| * Suppress large test that always times-outNeil Fuller2014-05-271-0/+5
* | Merge "Add interruptibility/wake on close to FileChannel.lock()"Neil Fuller2014-06-042-3/+8
|\ \
| * | Add interruptibility/wake on close to FileChannel.lock()Neil Fuller2014-06-032-3/+8
* | | Merge "Fix ZoneInfoDBTest.testGoodOverride"Neil Fuller2014-06-031-15/+17
|\ \ \
| * | | Fix ZoneInfoDBTest.testGoodOverrideNeil Fuller2014-06-021-15/+17
| |/ /
* | | Merge "Fix BufferTest.testAccess"Neil Fuller2014-06-031-2/+5
|\ \ \
| * | | Fix BufferTest.testAccessNeil Fuller2014-06-021-2/+5
| |/ /
* | | am 971bcaa5: Merge "Fix for flakiness in URLConnectionTest.testServerShutdown...Neil Fuller2014-05-301-0/+6
|\ \ \
| * \ \ Merge "Fix for flakiness in URLConnectionTest.testServerShutdownOutput"Neil Fuller2014-05-301-0/+6
| |\ \ \
| | * | | Fix for flakiness in URLConnectionTest.testServerShutdownOutputNeil Fuller2014-05-281-0/+6
| | | |/ | | |/|
* | | | am 4352ab40: Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-297-8/+234
|\ \ \ \ | |/ / /
| * | | Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-297-8/+234
| |\ \ \ | | |_|/ | |/| |
| | * | Document and assert support for TLS-PSK cipher suites.Alex Klyubin2014-05-277-8/+234
* | | | am 919849b0: Merge "Remove reference to unused okhttp-test build target"Neil Fuller2014-05-291-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Remove reference to unused okhttp-test build target"Neil Fuller2014-05-291-1/+1
| |\ \ \
| | * | | Remove reference to unused okhttp-test build targetNeil Fuller2014-05-291-1/+1
| | | |/ | | |/|
* | | | am 6c16a47c: Merge "Simplify assertions about SSLEngine."Alex Klyubin2014-05-282-78/+6
|\ \ \ \ | |/ / /
| * | | Merge "Simplify assertions about SSLEngine."Alex Klyubin2014-05-282-78/+6
| |\ \ \
| | * | | Simplify assertions about SSLEngine.Alex Klyubin2014-05-232-78/+6
* | | | | am b106b5f3: Merge "Update SSLEngine Javadoc to reflect recent changes."Alex Klyubin2014-05-281-53/+358
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update SSLEngine Javadoc to reflect recent changes."Alex Klyubin2014-05-281-53/+358
| |\ \ \ \