summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am af8bffb1: Improve System.nanoTime documentation.Elliott Hughes2013-04-300-0/+0
|\
| * Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
* | am e2c689ab: Merge "Improve System.nanoTime documentation."Elliott Hughes2013-04-301-1/+1
|\ \
| * \ Merge "Improve System.nanoTime documentation."Elliott Hughes2013-05-011-1/+1
| |\ \
| | * | Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
* | | | am db4ebcbc: Merge "Fix an ugly bug where try/catch offsets weren\'t being ma...Brian Carlstrom2013-04-303-39/+99
|\ \ \ \ | |/ / /
| * | | Merge "Fix an ugly bug where try/catch offsets weren't being mapped properly"Brian Carlstrom2013-04-303-39/+99
| |\ \ \
| | * | | Fix an ugly bug where try/catch offsets weren't being mapped properlyBenoit Lamarche2013-04-303-39/+99
| |/ / /
* | | | am c8bc5f77: Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dal...Brian Carlstrom2013-04-301-0/+8
|\ \ \ \ | |/ / /
| * | | Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"Brian Carlstrom2013-04-301-0/+8
| |\ \ \
| | * | | *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-devElliott Hughes2013-04-301-0/+8
* | | | | am 619c4ad4: Merge "Manually merge "Compact merged dexes on their byte aligne...Brian Carlstrom2013-04-301-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Manually merge "Compact merged dexes on their byte aligned size""Brian Carlstrom2013-04-301-0/+9
| |\ \ \ \ | | |/ / /
| | * | | Manually merge "Compact merged dexes on their byte aligned size"Jesse Wilson2013-04-301-0/+9
* | | | | am 9b040f6a: Merge "Add missing @Override annotations"Brian Carlstrom2013-04-302-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add missing @Override annotations"Brian Carlstrom2013-04-302-6/+6
| |\ \ \ \ | | |/ / /
| | * | | Add missing @Override annotationsIan Rogers2013-04-302-6/+6
| |/ / /
* | | | am 0b42772c: Merge "Fix DexMerger to emit dex files without extended op codes."Brian Carlstrom2013-04-301-2/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am b2a9cdb4: Merge "Make Dex access faster by making binarySearch work."Brian Carlstrom2013-04-301-6/+11
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 22da590f: Merge "Remove redundant alignToFourBytes in favor of alignToFour...Brian Carlstrom2013-04-301-6/+9
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 1d28a94d: Merge "Improve exception detail message"Brian Carlstrom2013-04-301-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Improve exception detail message"Brian Carlstrom2013-04-301-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Improve exception detail messageBrian Carlstrom2013-04-301-2/+2
* | | | | am 73082851: Merge "Fix Dex.create(ByteBuffer) to not allocate a byte[] to ch...Brian Carlstrom2013-04-301-17/+19
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ / /
* | | | am 9252b359: Merge "Switch Dex from byte[] to ByteBuffer for backing store."Brian Carlstrom2013-04-301-93/+157
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 519fb611: Merge "Add Dex.create(ByteBuffer)"Brian Carlstrom2013-04-301-0/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add Dex.create(ByteBuffer)"Brian Carlstrom2013-04-301-0/+26
| |\ \ \ \ | | |/ / /
| | * | | Add Dex.create(ByteBuffer)Brian Carlstrom2013-04-301-0/+26
* | | | | am 6f284a09: Merge "Move dex utilities from dalvik/dx to libcore/dex part 2"Brian Carlstrom2013-04-3026-1/+3058
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ /
* | | am 87b4b0f8: Merge "Implement getDateFormatOrder."Elliott Hughes2013-04-303-62/+141
|\ \ \ | |/ /
| * | Merge "Implement getDateFormatOrder."Elliott Hughes2013-04-303-62/+141
| |\ \
| | * | Implement getDateFormatOrder.Elliott Hughes2013-04-303-62/+141
* | | | am 0800e47a: Merge "Move JSSE to new package"Kenny Root2013-04-29143-340/+493
|\ \ \ \ | |/ / /
| * | | Merge "Move JSSE to new package"Kenny Root2013-04-30143-340/+493
| |\ \ \ | | |/ / | |/| |
| | * | Move JSSE to new packageKenny Root2013-04-29143-340/+493
* | | | am 6cc37941: Merge "Fix various of the harmony nio tests."Elliott Hughes2013-04-295-31/+49
|\ \ \ \ | |/ / /
| * | | 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
| |/ /