summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix Short.compare.Elliott Hughes2013-05-131-1/+1
* Merge "Improve java.lang.reflect.Modifier documentation."Elliott Hughes2013-05-131-109/+22
|\
| * Improve java.lang.reflect.Modifier documentation.Elliott Hughes2013-05-131-109/+22
* | Merge "Move some files with dalvik dependencies to libdvm"Brian Carlstrom2013-05-1330-0/+3
|\ \ | |/ |/|
| * Move some files with dalvik dependencies to libdvmBrian Carlstrom2013-05-1330-0/+3
* | Merge "Fix String.replace("", x) for strings with non-0 offsets."Elliott Hughes2013-05-132-2/+13
|\ \ | |/ |/|
| * Fix String.replace("", x) for strings with non-0 offsets.Elliott Hughes2013-05-132-2/+13
|/
* Merge "Clean up two unnecessary 'implements' clauses."Elliott Hughes2013-05-112-2/+2
|\
| * Clean up two unnecessary 'implements' clauses.Elliott Hughes2013-05-102-2/+2
* | Merge "Add @SafeVarargs."Elliott Hughes2013-05-114-0/+38
|\ \
| * | Add @SafeVarargs.Elliott Hughes2013-05-104-0/+38
| |/
* | Merge "Tracking libnativehelper dependencies"Brian Carlstrom2013-05-111-0/+1
|\ \ | |/ |/|
| * Tracking libnativehelper dependenciesBrian Carlstrom2013-05-101-0/+1
* | Merge "Move more utility classes from libcore to libnativehelper (part 2)"Brian Carlstrom2013-05-107-669/+0
|\ \
| * | Move more utility classes from libcore to libnativehelper (part 2)Brian Carlstrom2013-05-107-669/+0
| |/
* | Merge "Finish off AutoCloseable."Conley Owens2013-05-108-15/+21
|\ \ | |/ |/|
| * Finish off AutoCloseable.Elliott Hughes2013-05-108-15/+21
|/
* Merge "Remove duplicate JNIHelp.h import"Brian Carlstrom2013-05-101-1/+0
|\
| * Remove duplicate JNIHelp.h importBrian Carlstrom2013-05-101-1/+0
|/
* Merge "Ensure array_ is initialized."Brian Carlstrom2013-05-101-1/+1
|\
| * Ensure array_ is initialized.Ian Rogers2013-05-101-1/+1
|/
* Merge changes Ie07e5901,I8a154f8bBrian Carlstrom2013-05-1014-447/+122
|\
| * resolved conflicts for merge of f78109f6 to dalvik-devElliott Hughes2013-05-095-29/+118
| * 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
|\