summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Make it clearer that a new MockWebServer is created for each test runBrian Carlstrom2013-05-061-2/+2
| | |/ | |/|
* | | Merge "NativeCrypto: replace Harmony routines with OpenSSL"Kenny Root2013-05-063-82/+40
|\ \ \ | |/ / |/| / | |/
| * NativeCrypto: replace Harmony routines with OpenSSLKenny Root2013-05-063-82/+40
|/
* Merge "Various regex test fixes."Elliott Hughes2013-05-0410-1621/+134
|\
| * Various regex test fixes.Elliott Hughes2013-05-0310-1621/+134
|/
* Merge "Add the harmony regex tests."Elliott Hughes2013-05-039-0/+4585
|\
| * Add the harmony regex tests.Elliott Hughes2013-05-039-0/+4585
|/
* Merge "Replace mentions of old JSSE package name"Kenny Root2013-05-034-4/+4
|\
| * Replace mentions of old JSSE package nameKenny Root2013-05-034-4/+4
|/
* Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
|\
| * NativeCrypto: exit early when ssl_session is nullKenny Root2013-05-031-0/+3
* | Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
|\ \ | |/
| * NativeCrypto: move key conversion to JavaKenny Root2013-05-035-204/+83
* | Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
|\ \ | |/
| * Move encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
* | Merge "Add harmony java.nio.charset tests."Elliott Hughes2013-05-0337-0/+7009
|\ \ | |/ |/|
| * Add harmony java.nio.charset tests.Elliott Hughes2013-05-0337-0/+7009
|/
* Merge "Add -host suffix for master changes"Brian Carlstrom2013-05-031-1/+1
|\
| * Add -host suffix for master changesKenny Root2013-05-021-1/+1
|/
* Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-024-60/+138
|\
| * NativeCrypto: build native library standaloneKenny Root2013-05-024-60/+138
* | 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
* | | 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
|/ /
* | Merge "Add the harmony BufferedReaderTest."Elliott Hughes2013-05-021-0/+592
|\ \
| * | Add the harmony BufferedReaderTest.Elliott Hughes2013-05-011-0/+592
|/ /
* | 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
|/ /
* | Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
|\ \ | |/ |/|
| * More ICU.getDateFormatOrder tests.Elliott Hughes2013-05-011-0/+4
|/
* Merge "Improve System.nanoTime documentation."Elliott Hughes2013-05-011-1/+1
|\
| * Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
* | 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
|/ /
* | 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
* | | 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
* | | Merge "Add missing @Override annotations"Brian Carlstrom2013-04-302-6/+6
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /