summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | am 4f5a2379: Merge "Add -host suffix for master changes"Brian Carlstrom2013-05-031-1/+1
|\ \ | |/
| * Merge "Add -host suffix for master changes"Brian Carlstrom2013-05-031-1/+1
| |\
| | * Add -host suffix for master changesKenny Root2013-05-021-1/+1
| |/
* | am 9eda20c2: Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-024-60/+138
|\ \ | |/
| * Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-024-60/+138
| |\
| | * NativeCrypto: build native library standaloneKenny Root2013-05-024-60/+138
* | | am e2aa9af9: Merge "Fix BufferedReader.readLine to not read ahead after \'\r\'."Elliott Hughes2013-05-022-80/+159
|\ \ \ | |/ /
| * | Merge "Fix BufferedReader.readLine to not read ahead after '\r'."Elliott Hughes2013-05-022-80/+159
| |\ \
| | * | Fix BufferedReader.readLine to not read ahead after '\r'.Elliott Hughes2013-05-022-80/+159
* | | | am e16c809d: Merge "Tracking changes to *-host for host shared libraries"Brian Carlstrom2013-05-022-54/+10
|\ \ \ \ | |/ / /
| * | | Merge "Tracking changes to *-host for host shared libraries"Brian Carlstrom2013-05-022-54/+10
| |\ \ \ | | |/ / | |/| |
| | * | Tracking changes to *-host for host shared librariesBrian Carlstrom2013-05-012-54/+10
| |/ /
* | | am 06ebe80b: Merge "Add the harmony BufferedReaderTest."Elliott Hughes2013-05-011-0/+592
|\ \ \ | |/ /
| * | Merge "Add the harmony BufferedReaderTest."Elliott Hughes2013-05-021-0/+592
| |\ \
| | * | Add the harmony BufferedReaderTest.Elliott Hughes2013-05-011-0/+592
| |/ /
* | | am 2b2224dd: Merge "Fix ScopedStringChars to behave like ScopedUtfChars."Elliott Hughes2013-05-014-54/+72
|\ \ \ | |/ /
| * | Merge "Fix ScopedStringChars to behave like ScopedUtfChars."Elliott Hughes2013-05-014-54/+72
| |\ \
| | * | Fix ScopedStringChars to behave like ScopedUtfChars.Elliott Hughes2013-05-014-54/+72
| |/ /
* | | am ad86c68a: Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
|\ \ \ | |/ /
| * | Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
| |\ \ | | |/ | |/|
| | * More ICU.getDateFormatOrder tests.Elliott Hughes2013-05-011-0/+4
| |/
* | 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