summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-devElliott Hughes2013-04-301-0/+8
* Manually merge "Compact merged dexes on their byte aligned size"Jesse Wilson2013-04-301-0/+9
* Add missing @Override annotationsIan Rogers2013-04-302-6/+6
* Merge "Fix DexMerger to emit dex files without extended op codes."Brian Carlstrom2013-04-301-2/+2
|\
| * Fix DexMerger to emit dex files without extended op codes.Jesse Wilson2013-04-301-2/+2
* | Merge "Make Dex access faster by making binarySearch work."Brian Carlstrom2013-04-301-6/+11
|\ \ | |/
| * Make Dex access faster by making binarySearch work.Jesse Wilson2013-04-301-6/+11
* | Merge "Remove redundant alignToFourBytes in favor of alignToFourBytesWithZero...Brian Carlstrom2013-04-301-6/+9
|\ \ | |/
| * Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFillBrian Carlstrom2013-04-301-6/+9
* | Merge "Improve exception detail message"Brian Carlstrom2013-04-301-2/+2
|\ \ | |/
| * Improve exception detail messageBrian Carlstrom2013-04-301-2/+2
* | Merge "Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic"Brian Carlstrom2013-04-301-17/+19
|\ \ | |/
| * Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magicBrian Carlstrom2013-04-301-17/+19
|/
* Merge "Switch Dex from byte[] to ByteBuffer for backing store."Brian Carlstrom2013-04-301-93/+157
|\
| * Switch Dex from byte[] to ByteBuffer for backing store.Jesse Wilson2013-04-301-93/+157
* | Merge "Add Dex.create(ByteBuffer)"Brian Carlstrom2013-04-301-0/+26
|\ \ | |/
| * Add Dex.create(ByteBuffer)Brian Carlstrom2013-04-301-0/+26
* | Merge "Move dex utilities from dalvik/dx to libcore/dex part 2"Brian Carlstrom2013-04-3026-1/+3058
|\ \ | |/
| * Move dex utilities from dalvik/dx to libcore/dex part 2Jesse Wilson2013-04-3026-1/+3058
|/
* Merge "Implement getDateFormatOrder."Elliott Hughes2013-04-303-62/+141
|\
| * Implement getDateFormatOrder.Elliott Hughes2013-04-303-62/+141
* | Merge "Move JSSE to new package"Kenny Root2013-04-30143-340/+493
|\ \ | |/ |/|
| * Move JSSE to new packageKenny Root2013-04-29143-340/+493
* | Merge "Fix various of the harmony nio tests."Elliott Hughes2013-04-295-31/+49
|\ \ | |/ |/|
| * Fix various of the harmony nio tests.Elliott Hughes2013-04-265-31/+49
|/
* Merge "Add the harmony nio tests."Elliott Hughes2013-04-26102-0/+23248
|\
| * Add the harmony nio tests.Elliott Hughes2013-04-26102-0/+23248
|/
* Merge "Fix ZoneInfoDBTest."Elliott Hughes2013-04-261-1/+1
|\
| * Fix ZoneInfoDBTest.Elliott Hughes2013-04-261-1/+1
|/
* Merge "Remove the now-unused ZoneInfoDB.getVersion API."Elliott Hughes2013-04-261-4/+0
|\
| * Remove the now-unused ZoneInfoDB.getVersion API.Elliott Hughes2013-04-261-4/+0
* | Merge "Add the harmony annotation tests."Elliott Hughes2013-04-265-7/+111
|\ \ | |/ |/|
| * Add the harmony annotation tests.Elliott Hughes2013-04-265-7/+111
|/
* Merge "Fix vogar --mode device's fallback time zone."Elliott Hughes2013-04-261-1/+4
|\
| * Fix vogar --mode device's fallback time zone.Elliott Hughes2013-04-261-1/+4
|/
* Merge "Cope with a corrupt tzdata update."Elliott Hughes2013-04-265-145/+252
|\
| * Cope with a corrupt tzdata update.Elliott Hughes2013-04-265-145/+252
* | Merge "Fix additional races in org.apache.harmony.security.x509.Extensions"Brian Carlstrom2013-04-262-23/+44
|\ \
| * | Fix additional races in org.apache.harmony.security.x509.ExtensionsBrian Carlstrom2013-04-252-23/+44
|/ /
* | Merge "TimerTest cleanup"Brian Carlstrom2013-04-251-339/+147
|\ \ | |/ |/|
| * TimerTest cleanupBrian Carlstrom2013-04-251-339/+147
|/
* Merge "Only enforce the encrypted bit in the GPBF, and ignore other unsupport...Elliott Hughes2013-04-253-5/+15
|\
| * Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.William Luh2013-04-253-5/+15
|/
* Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-253-0/+2639
|\
| * Fix a bug in DatagramChannel.send.Elliott Hughes2013-04-243-0/+2639
* | Merge "Do not set valueDecoded until after the value is decoded"Brian Carlstrom2013-04-251-2/+2
|\ \ | |/ |/|
| * Do not set valueDecoded until after the value is decodedBrian Carlstrom2013-04-241-2/+2
* | Merge "Fix getLocalAddress on closed sockets."Elliott Hughes2013-04-256-38/+40
|\ \
| * | Fix getLocalAddress on closed sockets.Elliott Hughes2013-04-246-38/+40
|/ /
* | Merge "Reads from /dev/urandom can't really block."Elliott Hughes2013-04-247-89/+514
|\ \