summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix URLConnectionTest after latest okhttp update.Narayan Kamath2013-06-121-2/+2
* Merge "Moving java.lang.String to libdvm"Brian Carlstrom2013-06-061-0/+0
|\
| * Moving java.lang.String to libdvmBrian Carlstrom2013-06-051-0/+0
* | Merge "NativeCrypto: handle X.509 serial number 0"Kenny Root2013-06-051-3/+2
|\ \ | |/ |/|
| * NativeCrypto: handle X.509 serial number 0Kenny Root2013-06-051-3/+2
* | Merge "Move additional files to libdvm"Brian Carlstrom2013-06-053-0/+0
|\ \
| * | Move additional files to libdvmBrian Carlstrom2013-06-053-0/+0
|/ /
* | Merge "Change the VMStack interface used by serialization."Brian Carlstrom2013-06-052-18/+17
|\ \ | |/ |/|
| * Change the VMStack interface used by serialization.Elliott Hughes2013-06-052-18/+17
|/
* Merge "NativeCrypto: free error state on client_cb"Kenny Root2013-06-051-0/+5
|\
| * NativeCrypto: free error state on client_cbKenny Root2013-06-051-0/+5
* | Merge "Add hidden Modifiers for SYNTHETIC and MIRANDA"Brian Carlstrom2013-06-051-1/+13
|\ \ | |/ |/|
| * Add hidden Modifiers for SYNTHETIC and MIRANDAIan Rogers2013-06-041-1/+13
|/
* Merge "PBKDF2 tests to exercise new, correct PBE implementation."Brian Carlstrom2013-06-032-7/+50
|\
| * PBKDF2 tests to exercise new, correct PBE implementation.William Luh2013-06-012-7/+50
|/
* Merge "Move initialization check higher for updateAAD"Kenny Root2013-05-311-3/+3
|\
| * Move initialization check higher for updateAADKenny Root2013-05-311-3/+3
|/
* Merge "Fix conscrypt package name in SecureRandomTest"Brian Carlstrom2013-05-301-1/+1
|\
| * Fix conscrypt package name in SecureRandomTestBrian Carlstrom2013-05-291-1/+1
|/
* Merge "Use correct signature for NativeBN_BN_is_prime_ex"Brian Carlstrom2013-05-301-2/+2
|\
| * Use correct signature for NativeBN_BN_is_prime_exChris Dearman2013-05-291-2/+2
* | Merge "NativeCrypto: check that npnProtocols != NULL"Kenny Root2013-05-291-14/+19
|\ \
| * | NativeCrypto: check that npnProtocols != NULLKenny Root2013-05-291-14/+19
| |/
* | Merge "NativeCrypto: change debug format string to "%.*s""Kenny Root2013-05-291-2/+2
|\ \ | |/ |/|
| * NativeCrypto: change debug format string to "%.*s"Kenny Root2013-05-291-2/+2
|/
* Merge "Use the jarjar names of security providers"Kenny Root2013-05-281-3/+3
|\
| * Use the jarjar names of security providersKenny Root2013-05-281-3/+3
|/
* Merge "NativeCrypto: add debug option for SSL streams"Kenny Root2013-05-281-0/+78
|\
| * NativeCrypto: add debug option for SSL streamsKenny Root2013-05-281-0/+78
|/
* Merge "Flip sense of negative isUnsupported* methods"Brian Carlstrom2013-05-241-17/+17
|\
| * Flip sense of negative isUnsupported* methodsBrian Carlstrom2013-05-241-17/+17
* | Merge "CipherTest fixes"Brian Carlstrom2013-05-242-32/+168
|\ \ | |/
| * CipherTest fixesBrian Carlstrom2013-05-242-32/+168
|/
* Merge "Simplify defaulting for system properties, and trust the environment l...Elliott Hughes2013-05-153-44/+48
|\
| * Simplify defaulting for system properties, and trust the environment less.Elliott Hughes2013-05-143-44/+48
* | Merge "Remove a workaround for a bionic bug that's been fixed."Elliott Hughes2013-05-151-5/+0
|\ \
| * | Remove a workaround for a bionic bug that's been fixed.Elliott Hughes2013-05-141-5/+0
| |/
* | Merge "Add classes for AEAD encryption"Kenny Root2013-05-156-1/+482
|\ \
| * | Add classes for AEAD encryptionKenny Root2013-05-146-1/+482
| |/
* | Merge "Move ScopedFd from libcore to libnativehelper (part 2)"Brian Carlstrom2013-05-141-46/+0
|\ \ | |/ |/|
| * Move ScopedFd from libcore to libnativehelper (part 2)Brian Carlstrom2013-05-141-46/+0
|/
* Merge "Expose Throwable changes."Elliott Hughes2013-05-141-26/+9
|\
| * Expose Throwable changes.Elliott Hughes2013-05-141-26/+9
|/
* Merge "Fix java.lang.Throwable's protected constructor."Elliott Hughes2013-05-142-44/+76
|\
| * Fix java.lang.Throwable's protected constructor.Elliott Hughes2013-05-132-44/+76
|/
* Merge "Un-@hide various APIs."Conley Owens2013-05-1322-92/+37
|\
| * Un-@hide various APIs.Elliott Hughes2013-05-1322-92/+37
|/
* Merge "Fix build."Elliott Hughes2013-05-131-1/+1
|\
| * Fix build.Elliott Hughes2013-05-131-1/+1
|/
* Merge "Fix Short.compare."Elliott Hughes2013-05-131-1/+1
|\