summaryrefslogtreecommitdiffstats
path: root/luni/src/main
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 6186821c to dalvik-devJesse Wilson2011-02-0775-91/+79
|\
| * Move libcore.base classes to libcore.util and libcore.io.Jesse Wilson2011-02-0772-91/+72
* | am e5720bcc: Avoid name collision in libcore.base vs android.util.LruCache.Jesse Wilson2011-02-073-245/+117
|\ \ | |/
| * Avoid name collision in libcore.base vs android.util.LruCache.Jesse Wilson2011-02-073-245/+117
* | Merge "Avoid file locks in java.util.prefs." into dalvik-devJesse Wilson2011-02-072-60/+38
|\ \
| * | Avoid file locks in java.util.prefs.Jesse Wilson2011-02-072-60/+38
* | | Fix serialization of DecimalFormatSymbols.Elliott Hughes2011-02-0422-121/+121
* | | Merge "Improve CharsetDecoder's quality of implementation, like CharsetEncode...Elliott Hughes2011-02-043-107/+64
|\ \ \
| * | | Improve CharsetDecoder's quality of implementation, like CharsetEncoder.Elliott Hughes2011-02-023-107/+64
| |/ /
* | | am adf31bd1: Merge "Permit cache elements to have non-symmetric sizes."Jesse Wilson2011-02-032-17/+91
|\ \ \ | |/ / |/| / | |/
| * Merge "Permit cache elements to have non-symmetric sizes."Jesse Wilson2011-02-032-17/+91
| |\
| | * Permit cache elements to have non-symmetric sizes.Jesse Wilson2011-02-032-17/+91
* | | Merge "Bring CharsetDecoderICU more in line with CharsetEncoderICU." into dal...Elliott Hughes2011-02-025-141/+18
|\ \ \
| * | | Bring CharsetDecoderICU more in line with CharsetEncoderICU.Elliott Hughes2011-02-025-141/+18
* | | | am 4155a249: Performance improvements to NativeCrypto based MessageDigest APIBrian Carlstrom2011-02-024-143/+189
|\ \ \ \ | | |/ / | |/| |
| * | | Performance improvements to NativeCrypto based MessageDigest APIBrian Carlstrom2011-02-014-143/+189
| | |/ | |/|
* | | Merge "Don't parse or format IP addresses in cert code." into dalvik-devJesse Wilson2011-02-011-181/+21
|\ \ \ | |_|/ |/| |
| * | Don't parse or format IP addresses in cert code.Jesse Wilson2011-02-011-181/+21
* | | Merge "Improve CharsetEncoder to handle surrogates gracefully." into dalvik-devElliott Hughes2011-02-014-186/+47
|\ \ \ | |/ / |/| |
| * | Improve CharsetEncoder to handle surrogates gracefully.Elliott Hughes2011-01-314-186/+47
* | | Merge "Don't do DNS lookups in URL.equals()" into dalvik-devJesse Wilson2011-01-312-88/+47
|\ \ \ | |/ / |/| |
| * | Don't do DNS lookups in URL.equals()Jesse Wilson2011-01-312-88/+47
* | | Merge "Tidying of OutputStreamWriter and a couple of related tests." into dal...Elliott Hughes2011-01-311-8/+4
|\ \ \ | |/ / |/| |
| * | Tidying of OutputStreamWriter and a couple of related tests.Elliott Hughes2011-01-311-8/+4
* | | am c906eaf2: am 7374d4fa: am 90ff8e2c: Remember intermediate CAs in TrustMang...Brian Carlstrom2011-01-302-53/+52
|\ \ \ | |/ / |/| / | |/
| * am 7374d4fa: am 90ff8e2c: Remember intermediate CAs in TrustMangerImpl\'s Ind...Brian Carlstrom2011-01-302-53/+52
| |\
| | * Remember intermediate CAs in TrustMangerImpl's IndexedPKIXParametersBrian Carlstrom2011-01-302-53/+52
| | * Fix @see linksBrad Fitzpatrick2011-01-271-4/+4
| | * Fix libcore javadoc errors.Elliott Hughes2011-01-274-79/+26
* | | Merge "Fix OutputStreamWriter's handling of surrogates." into dalvik-devElliott Hughes2011-01-302-26/+80
|\ \ \
| * | | Fix OutputStreamWriter's handling of surrogates.Elliott Hughes2011-01-302-26/+80
* | | | Merge commit 'e2b2e81f' into manualmergeJesse Wilson2011-01-305-61/+218
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Use an LRU to cache reflection objects in Class.Jesse Wilson2011-01-305-64/+218
* | | Remove a useless layer of indirection.Elliott Hughes2011-01-281-60/+19
* | | Merge "Fix NoArrayTest, and fix ReadOnlyDirectByteBuffer too." into dalvik-devElliott Hughes2011-01-282-3/+15
|\ \ \
| * | | Fix NoArrayTest, and fix ReadOnlyDirectByteBuffer too.Elliott Hughes2011-01-282-3/+15
* | | | Merge "Tolerate leading slash in Cipher transformation" into dalvik-devBrian Carlstrom2011-01-281-0/+5
|\ \ \ \
| * | | | Tolerate leading slash in Cipher transformationBrian Carlstrom2011-01-281-0/+5
| |/ / /
* | | | Use the standard zlib options everyone else uses.Elliott Hughes2011-01-281-4/+2
|/ / /
* | | Fix an unclosed tag in javadoc.Elliott Hughes2011-01-271-1/+1
* | | Better tests for Float.parseFloat/Double.parseDouble, plus some fixes.Elliott Hughes2011-01-274-82/+90
* | | Minor float/double parsing improvements.Elliott Hughes2011-01-261-51/+14
* | | Apply harmony's fix for HARMONY-6594.Elliott Hughes2011-01-261-9/+16
* | | Fix time zone formatting for custom SimpleTimeZone instances.Elliott Hughes2011-01-261-0/+9
* | | Our DirectByteBuffer can implement array(), arrayOffset(), and hasArray().Elliott Hughes2011-01-262-9/+20
* | | Merge "Fix new File("").length to behave like the RI." into dalvik-devElliott Hughes2011-01-251-0/+3
|\ \ \
| * | | Fix new File("").length to behave like the RI.Elliott Hughes2011-01-251-0/+3
* | | | am fedab477: am 7be1bb6d: am 0ac85ead: Tracking jarjar of org.bouncycastle to...Brian Carlstrom2011-01-251-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 7be1bb6d: am 0ac85ead: Tracking jarjar of org.bouncycastle to com.android....Brian Carlstrom2011-01-251-1/+1
| |\ \
| | * \ am 0ac85ead: Tracking jarjar of org.bouncycastle to com.android.org.bouncycastleBrian Carlstrom2011-01-251-1/+1
| | |\ \ | | | |/