summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't return NULL as a jint.Ian Rogers2014-06-241-1/+1
* Merge "Fix race condition in WeakHashMapTest."Mathieu Chartier2014-06-231-6/+11
|\
| * Fix race condition in WeakHashMapTest.Mathieu Chartier2014-06-231-6/+11
* | Merge "libcore: Clean up Enum.compareTo(E)"Narayan Kamath2014-06-241-1/+1
|\ \ | |/ |/|
| * libcore: Clean up Enum.compareTo(E)Valter Strods2014-06-241-1/+1
|/
* Merge "Build fix: Remove reference to deleted java_io_Console function"Neil Fuller2014-06-201-1/+0
|\
| * Build fix: Remove reference to deleted java_io_Console functionNeil Fuller2014-06-231-1/+0
* | Merge "Unimplement Console.readPassword and remove test"Neil Fuller2014-06-204-93/+4
|\ \ | |/
| * Unimplement Console.readPassword and remove testNeil Fuller2014-06-234-93/+4
* | Merge "Assert that setEnabledProtocols/CipherSuites copy their inputs."Alex Klyubin2014-06-203-0/+60
|\ \
| * | Assert that setEnabledProtocols/CipherSuites copy their inputs.Alex Klyubin2014-06-193-0/+60
|/ /
* | Merge "Assert the updated list of supported ECDHE-PSK cipher suites."Alex Klyubin2014-06-181-2/+2
|\ \
| * | Assert the updated list of supported ECDHE-PSK cipher suites.Alex Klyubin2014-06-041-2/+2
* | | Merge "Fix for currency symbol coming from the default locale"Neil Fuller2014-06-174-19/+52
|\ \ \ | |_|/ |/| |
| * | Fix for currency symbol coming from the default localeNeil Fuller2014-06-194-19/+52
|/ /
* | Merge "Fix CurrencyTest.test_getSymbol for unknown variants"Neil Fuller2014-06-173-41/+60
|\ \
| * | Fix CurrencyTest.test_getSymbol for unknown variantsNeil Fuller2014-06-183-41/+60
* | | Merge "Removing tests that test the SqlLite API directly."Neil Fuller2014-06-1714-3226/+145
|\ \ \
| * | | Removing tests that test the SqlLite API directly.Neil Fuller2014-06-1714-3226/+145
* | | | Merge "CTS fix: Signature2Test.test_clone()"Neil Fuller2014-06-172-1/+11
|\ \ \ \
| * | | | CTS fix: Signature2Test.test_clone()Neil Fuller2014-06-182-1/+11
| | |/ / | |/| |
* | | | Merge "Dalvik is dead, long live Dalvik! DO NOT MERGE"Brian Carlstrom2014-06-1824-11128/+34
|\ \ \ \
| * | | | Dalvik is dead, long live Dalvik! DO NOT MERGEBrian Carlstrom2014-06-1824-11128/+34
* | | | | Merge "Fix libart files to work with javadoc"Brian Carlstrom2014-06-182-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix libart files to work with javadocBrian Carlstrom2014-06-182-2/+2
|/ / / /
* | | | Merge "Fix getISO3Country and getISO3Language."Narayan Kamath2014-06-174-17/+21
|\ \ \ \
| * | | | Fix getISO3Country and getISO3Language.Narayan Kamath2014-06-184-17/+21
* | | | | Merge "Relax KeyPairGeneratorTest"Neil Fuller2014-06-171-8/+43
|\ \ \ \ \
| * | | | | Relax KeyPairGeneratorTestNeil Fuller2014-06-181-8/+43
| | |/ / / | |/| | |
* | | | | Merge "Alter regression test for bug 71369 now the issue is understood"Neil Fuller2014-06-171-3/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Alter regression test for bug 71369 now the issue is understoodNeil Fuller2014-06-181-3/+10
|/ / / /
* | | | 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
|\ \ \