summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Some of our helpers have moved into libnativehelpers.Elliott Hughes2013-05-0910-418/+4
* Merge "Improve ProcessManager."Elliott Hughes2013-05-072-340/+283
|\
| * Improve ProcessManager.Elliott Hughes2013-05-072-340/+283
* | Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0725-69/+37
|\ \
| * | NativeCrypto: Fix a lot of random doc bugsKenny Root2013-05-0725-69/+37
* | | Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-071-65/+63
|\ \ \
| * | | NativeCrypto: use strings instead of loading classKenny Root2013-05-071-65/+63
| |/ /
* | | Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-072-2/+87
|\ \ \ | |/ / |/| |
| * | NativeCrypto: make our own X.509 key classKenny Root2013-05-072-2/+87
* | | Merge changes Ided7a6bf,I61339e02Kenny Root2013-05-071-3/+5
|\ \ \ | |/ / |/| |
| * | NativeCrypto: inline call to peekIntKenny Root2013-05-061-2/+5
| * | NativeCrypto: remove unused importKenny Root2013-05-061-1/+0
|/ /
* | Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
|\ \
| * | NativeCrypto: remove dep on Android host verifierKenny Root2013-05-061-3/+48
* | | Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
|\ \ \
| * | | NativeCrypto: pull in copy of EmptyArrayKenny Root2013-05-0611-10/+45
* | | | Merge "Make it clearer that a new MockWebServer is created for each test run"Brian Carlstrom2013-05-061-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | 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