summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix mentions of JSSEKenny Root2013-05-091-0/+1
* am 7def6439: Merge "Improve ProcessManager."Elliott Hughes2013-05-082-340/+283
|\
| * Merge "Improve ProcessManager."Elliott Hughes2013-05-072-340/+283
| |\
| | * Improve ProcessManager.Elliott Hughes2013-05-072-340/+283
* | | am 99e1ae90: Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0825-69/+37
|\ \ \ | |/ /
| * | 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
* | | | am 4ffab68b: Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-081-65/+63
|\ \ \ \ | |/ / /
| * | | 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
| | |/ /
* | | | am 30abb655: Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-082-2/+87
|\ \ \ \ | |/ / /
| * | | 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
* | | | am dafcbf80: Merge changes Ided7a6bf,I61339e02Kenny Root2013-05-081-3/+5
|\ \ \ \ | |/ / /
| * | | 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
| |/ /
* | | am ab4ab99b: Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
|\ \ \ | |/ /
| * | 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
* | | | am 7b65c5f0: Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
|\ \ \ \ | |/ / /
| * | | Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
| |\ \ \
| | * | | NativeCrypto: pull in copy of EmptyArrayKenny Root2013-05-0611-10/+45
* | | | | am a41da041: Merge "Make it clearer that a new MockWebServer is created for e...Brian Carlstrom2013-05-061-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/ | | |/|
* | | | am 3e7a5a21: Merge "NativeCrypto: replace Harmony routines with OpenSSL"Kenny Root2013-05-063-82/+40
|\ \ \ \ | |/ / /
| * | | Merge "NativeCrypto: replace Harmony routines with OpenSSL"Kenny Root2013-05-063-82/+40
| |\ \ \ | | |/ / | |/| / | | |/
| | * NativeCrypto: replace Harmony routines with OpenSSLKenny Root2013-05-063-82/+40
| |/
* | am f7e1ba48: Merge "Various regex test fixes."Elliott Hughes2013-05-0310-1621/+134
|\ \ | |/
| * Merge "Various regex test fixes."Elliott Hughes2013-05-0410-1621/+134
| |\
| | * Various regex test fixes.Elliott Hughes2013-05-0310-1621/+134
| |/
* | am a4f2eac7: Merge "Add the harmony regex tests."Elliott Hughes2013-05-039-0/+4585
|\ \ | |/
| * Merge "Add the harmony regex tests."Elliott Hughes2013-05-039-0/+4585
| |\
| | * Add the harmony regex tests.Elliott Hughes2013-05-039-0/+4585
| |/
* | am 645c1562: Merge "Replace mentions of old JSSE package name"Kenny Root2013-05-034-4/+4
|\ \ | |/
| * 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
| |/
* | am aed4814b: Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
|\ \ | |/
| * 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
* | | am 6821dc7b: Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
|\ \ \ | |/ /
| * | Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
| |\ \ | | |/
| | * NativeCrypto: move key conversion to JavaKenny Root2013-05-035-204/+83
* | | am 603a9f11: Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
|\ \ \ | |/ /
| * | Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
| |\ \ | | |/
| | * Move encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
* | | am 7977e59c: Merge "Add harmony java.nio.charset tests."Elliott Hughes2013-05-0337-0/+7009
|\ \ \ | |/ /
| * | 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
| |/