summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix build.Narayan Kamath2013-10-181-2/+12
* Merge "Simplify code in XmlPullParserFactory."Narayan Kamath2013-10-182-202/+59
|\
| * Simplify code in XmlPullParserFactory.Narayan Kamath2013-10-172-202/+59
|/
* Merge "Get stricter about DOCTYPEs."Narayan Kamath2013-10-172-8/+9
|\
| * Get stricter about DOCTYPEs.Narayan Kamath2013-10-162-8/+9
|/
* Merge "Improve SocketChannel documentation."Elliott Hughes2013-10-161-20/+27
|\
| * Improve SocketChannel documentation.Elliott Hughes2013-10-151-20/+27
* | Merge "Use @throws rather than the deprecated and unusual @exception."Elliott Hughes2013-10-1624-239/+238
|\ \ | |/ |/|
| * Use @throws rather than the deprecated and unusual @exception.Elliott Hughes2013-10-1524-239/+238
|/
* Merge "Fix a varargs warning in MessageFormatTest."Elliott Hughes2013-10-151-2/+2
|\
| * Fix a varargs warning in MessageFormatTest.Elliott Hughes2013-10-151-2/+2
* | Merge "Improve the charAt documentation."Elliott Hughes2013-10-154-35/+8
|\ \ | |/ |/|
| * Improve the charAt documentation.Elliott Hughes2013-10-154-35/+8
|/
* Merge "Add a unit test for a Class.getDeclaringClass bug."Brian Carlstrom2013-10-131-2/+18
|\
| * Add a unit test for a Class.getDeclaringClass bug.Elliott Hughes2013-10-121-2/+18
* | Merge "Make JSONObject summary documentation clearer."Elliott Hughes2013-10-121-20/+21
|\ \ | |/ |/|
| * Make JSONObject summary documentation clearer.Elliott Hughes2013-10-121-20/+21
|/
* Merge "Add a test for a ja_JP AlphabeticIndex bug."Elliott Hughes2013-10-111-0/+2
|\
| * Add a test for a ja_JP AlphabeticIndex bug.Elliott Hughes2013-10-111-0/+2
|/
* Merge "JarUtils: remove reference to X509CertImpl"Kenny Root2013-10-111-13/+18
|\
| * JarUtils: remove reference to X509CertImplKenny Root2013-10-101-13/+18
* | Merge "Remove zip file extension whitelists when validating dex file path."Brian Carlstrom2013-10-101-27/+26
|\ \
| * | Remove zip file extension whitelists when validating dex file path.Hui Lu2013-10-091-27/+26
* | | Merge "JarUtils: try using the DigestEncryptionAlgorithm"Kenny Root2013-10-103-26/+38
|\ \ \ | |/ / |/| / | |/
| * JarUtils: try using the DigestEncryptionAlgorithmKenny Root2013-10-093-26/+38
|/
* Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
|\
| * ProviderTest: add special rules for CipherKenny Root2013-10-071-16/+34
|/
* Merge "Stop using deprecated ucol_safeClone placement functionality."Elliott Hughes2013-10-071-2/+1
|\
| * Stop using deprecated ucol_safeClone placement functionality.Elliott Hughes2013-10-071-2/+1
|/
* Merge "Move conscrypt out to external/conscrypt"Kenny Root2013-10-03137-39288/+1
|\
| * Move conscrypt out to external/conscryptKenny Root2013-10-01137-39288/+1
|/
* Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-021-1/+1
|\
| * Conscrypt: add missing libraries to JNI libKenny Root2013-10-011-1/+1
|/
* Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-021-9/+12
|\
| * Conscrypt: fixing Android.mk dependenciesKenny Root2013-10-011-9/+12
|/
* Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
|\
| * I before E, except after CKenny Root2013-10-011-2/+2
|/
* Merge "Remove unsupported Cipher modes"Kenny Root2013-10-013-86/+88
|\
| * Remove unsupported Cipher modesKenny Root2013-09-303-86/+88
|/
* Merge "KeyGeneratorTest: add key sizes for HmacSHA224"Kenny Root2013-09-301-0/+2
|\
| * KeyGeneratorTest: add key sizes for HmacSHA224Kenny Root2013-09-291-0/+2
* | Merge "Add benchmark for SSL loopback"Kenny Root2013-09-291-0/+61
|\ \ | |/ |/|
| * Add benchmark for SSL loopbackKenny Root2013-09-291-0/+61
|/
* Merge "Conscrypt: correct key selection with no sigAlg"Kenny Root2013-09-272-3/+78
|\
| * Conscrypt: correct key selection with no sigAlgKenny Root2013-09-272-3/+78
|/
* Merge "Conscrypt: add SHA-224 with tests"Kenny Root2013-09-268-7/+231
|\
| * Conscrypt: add SHA-224 with testsKenny Root2013-09-268-7/+231
* | Merge "Add CAP_BLOCK_SUSPEND to OS constants"Michael Wright2013-09-263-0/+11
|\ \
| * | Add CAP_BLOCK_SUSPEND to OS constantsMichael Wright2013-09-263-0/+11
* | | Merge "Fix exceptions thrown in tests"Kenny Root2013-09-251-24/+8
|\ \ \ | | |/ | |/|