summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Expand)AuthorAgeFilesLines
...
* | Fix Mac build.Ian Rogers2014-06-101-0/+3
* | Merge "Tests for Runtime.*Memory()"Neil Fuller2014-06-101-26/+0
|\ \
| * | Tests for Runtime.*Memory()Neil Fuller2014-06-101-26/+0
* | | 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
| |/ /
* | | Build fix.Ian Rogers2014-06-091-0/+2
* | | Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-103-5/+70
|\ \ \ | |/ / |/| |
| * | Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-093-5/+70
* | | Shard the _getInstance test and skip the DH tests.Neil Fuller2014-06-091-50/+70
|/ /
* | Improve the load/loadLibrary documentation.Elliott Hughes2014-06-062-57/+42
|/
* 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-295-4/+197
|\ \ \ \ | |/ / /
| * | | Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-295-4/+197
| |\ \ \ | | |_|/ | |/| |
| | * | Document and assert support for TLS-PSK cipher suites.Alex Klyubin2014-05-275-4/+197
* | | | 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
| |\ \ \
| | * | | Update SSLEngine Javadoc to reflect recent changes.Alex Klyubin2014-05-231-53/+358
* | | | | am ddfd8597: Merge "Fix NetworkOnMainThreadException in KeyStoreTest"Neil Fuller2014-05-281-21/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix NetworkOnMainThreadException in KeyStoreTest"Neil Fuller2014-05-281-21/+27
| |\ \ \ \
| | * | | | Fix NetworkOnMainThreadException in KeyStoreTestNeil Fuller2014-05-281-21/+27
| | | |_|/ | | |/| |
* | | | | am 4fee9a24: Merge "ECParameterSpec: move curve selection to non-final"Kenny Root2014-05-271-14/+10
|\ \ \ \ \ | |/ / / /
| * | | | ECParameterSpec: move curve selection to non-finalKenny Root2014-05-271-14/+10
| | |_|/ | |/| |
* | | | am 322cabe3: Merge "Fix testCalendarSerialization for all locales"Neil Fuller2014-05-271-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fix testCalendarSerialization for all locales"Neil Fuller2014-05-271-1/+3
| |\ \ \
| | * | | Fix testCalendarSerialization for all localesNeil Fuller2014-05-231-1/+3
| | |/ /
* | | | am cbc04230: Merge "Fix a sorting bug in SSLSocket javadoc."Alex Klyubin2014-05-231-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "Fix a sorting bug in SSLSocket javadoc."Alex Klyubin2014-05-231-4/+4
| |\ \ \
| | * | | Fix a sorting bug in SSLSocket javadoc.Alex Klyubin2014-05-231-4/+4
| | | |/ | | |/|
* | | | am 21d8bd12: Merge "Adding more tests around System properties"Neil Fuller2014-05-231-1/+57
|\ \ \ \ | |/ / /
| * | | Merge "Adding more tests around System properties"Neil Fuller2014-05-231-1/+57
| |\ \ \
| | * | | Adding more tests around System propertiesNeil Fuller2014-05-211-1/+57
| | | |/ | | |/|
* | | | am 392ca3ac: Merge "Change exception priority for ByteBuffer.put(null)"Neil Fuller2014-05-231-4/+3
|\ \ \ \ | |/ / /
| * | | Merge "Change exception priority for ByteBuffer.put(null)"Neil Fuller2014-05-231-4/+3
| |\ \ \
| | * | | Change exception priority for ByteBuffer.put(null)Neil Fuller2014-05-211-4/+3
| | |/ /
* | | | am ce478bec: Merge "DigestTest: reduce flakiness by having more iterations"Kenny Root2014-05-211-1/+1
|\ \ \ \ | |/ / /
| * | | DigestTest: reduce flakiness by having more iterationsKenny Root2014-05-211-1/+1
| |/ /
* | | am a2138c1f: Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
|\ \ \ | |/ /
| * | Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
| |\ \
| | * | Fix typo in testNeil Fuller2014-05-211-1/+1
* | | | am 321dec9c: Merge "Keep Preferences tests working"Neil Fuller2014-05-214-3/+76
|\ \ \ \ | |/ / /
| * | | Keep Preferences tests workingNeil Fuller2014-05-214-3/+76
| |/ /
* | | am 49c2fa00: Merge "Deprecate use of BrokenTest and SideEffect"Neil Fuller2014-05-2113-31/+16
|\ \ \ | |/ /