summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13c5c066f4b4f2b4cd2afa2b73ea828099761844': Conscrypt: add missing libraries to JNI lib
| | * | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6d1d787a3e22deca8b2cd4a52e443d06391243e
* | | | | | | | | | | | | | | | | | | | am 88a8766a: am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-011-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88a8766a3a3edbe33e190542092b6519e1540af3': Conscrypt: fixing Android.mk dependencies
| * | | | | | | | | | | | | | | | | | | am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-011-9/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '800d4b54cbce08c54502227300c365aa3ac76b70': Conscrypt: fixing Android.mk dependencies
| | * | | | | | | | | | | | | | | | | | Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-021-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Conscrypt: fixing Android.mk dependenciesKenny Root2013-10-011-9/+12
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some dependencies on makefile orders from other libcore files. Change-Id: Iff62a2aebf3b58227fbe3157371c85c33f2db097
* | | | | | | | | | | | | | | | | | | | am 52041a8b: am 4d11667c: Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52041a8bf873950403273fff3233349d6dfe8b9d': I before E, except after C
| * | | | | | | | | | | | | | | | | | | am 4d11667c: Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d11667cd0e5b737c576128986fca03a226d08ee': I before E, except after C
| | * | | | | | | | | | | | | | | | | | Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | I before E, except after CKenny Root2013-10-011-2/+2
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and some other cases Change-Id: I45e2770fd4c734b5aefba124d3c09eef47294b43
* | | | | | | | | | | | | | | | | | | | am 5af43438: am 213ea54a: Merge "Add prefix to cert pin failure logging." ↵William Luh2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '5af4343891fe6d443609036e0ba2e9400c869486': Add prefix to cert pin failure logging.
| * | | | | | | | | | | | | | | | | | | am 213ea54a: Merge "Add prefix to cert pin failure logging." into klp-devWilliam Luh2013-10-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '213ea54a76332b3d0aef0de134c669ebc420cf33': Add prefix to cert pin failure logging.
| | * | | | | | | | | | | | | | | | | | Merge "Add prefix to cert pin failure logging." into klp-devWilliam Luh2013-09-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Add prefix to cert pin failure logging.William Luh2013-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-picked from commit 9d7ed68cc1f20892f491540790b03ece56735a12) Bug: 10912373 Change-Id: I033798c2c867f9d57e29ed7860f5e079b44640e2
* | | | | | | | | | | | | | | | | | | | | am 9030112e: Merge branch \'klp-dev-plus-aosp\' of ↵Geoff Mendal2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/libcore into klp-dev-plus-aosp * commit '9030112edeed73c382f46a756ed8f3e4fc0afd50':
| * | | | | | | | | | | | | | | | | | | | Merge branch 'klp-dev-plus-aosp' of ↵Geoff Mendal2013-09-303-86/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/libcore into klp-dev-plus-aosp
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a6ea917: am 25adf29f: Conscrypt: correct key selection with no sigAlgKenny Root2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a6ea917d4bc417447302fd1f30768a369e8ef12':
| * | | | | | | | | | | | | | | | | | | | | am 25adf29f: Conscrypt: correct key selection with no sigAlgKenny Root2013-09-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25adf29f112e58355fa0dca534783e9c02cc940b': Conscrypt: correct key selection with no sigAlg
* | | | | | | | | | | | | | | | | | | | | | am 82b60fe7: am 8f45400b: Merge "Remove unsupported Cipher modes"Kenny Root2013-10-013-86/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82b60fe7a97c3dd65ffe8a1f50c1de8bb85c00cc': Remove unsupported Cipher modes
| * | | | | | | | | | | | | | | | | | | | | am 8f45400b: Merge "Remove unsupported Cipher modes"Kenny Root2013-09-303-86/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | * commit '8f45400bf993775bd7f171ba1c764616c9e2909c': Remove unsupported Cipher modes
| | * | | | | | | | | | | | | | | | | | | Merge "Remove unsupported Cipher modes"Kenny Root2013-10-013-86/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Remove unsupported Cipher modesKenny Root2013-09-303-86/+88
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL silently ignores the padding modes when specified for stream ciphers, but apparently Java does not. Change-Id: Icd92122d63b3b8e99d704e8193414dda5057146d
* | | | | | | | | | | | | | | | | | | | | am 25adf29f: Conscrypt: correct key selection with no sigAlgKenny Root2013-09-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25adf29f112e58355fa0dca534783e9c02cc940b': Conscrypt: correct key selection with no sigAlg
| * | | | | | | | | | | | | | | | | | | | Conscrypt: correct key selection with no sigAlgKenny Root2013-09-272-3/+78
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KeyManagerImpl was changed to support the "EC_EC" and "EC_RSA" key types in the StandardNames document. The intention of those aliases are to require a certain signature type. If it is missing, it should accept any signature type as before. However, it was erroneously requiring the same signature type as the key type if it was missing. This causes RSA client certificates signed by an EC key, for instance, to fail. (cherry picked from commit 5936343fc25e9da8ea2ad7bfcbc0b59a7898bdbd) Bug: 10966884 Change-Id: I4fb1a005bf66510d0963019227c6ca3c5340c39d
* | | | | | | | | | | | | | | | | | | | am 434f25b9: am 40b8d8da: Merge "KeyGeneratorTest: add key sizes for HmacSHA224"Kenny Root2013-09-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '434f25b9c06a673d843239debecb621b3a96c34e': KeyGeneratorTest: add key sizes for HmacSHA224
| * | | | | | | | | | | | | | | | | | | am 40b8d8da: Merge "KeyGeneratorTest: add key sizes for HmacSHA224"Kenny Root2013-09-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40b8d8da849f14fb455bbeca6e733239cc6f1bdc': KeyGeneratorTest: add key sizes for HmacSHA224
| | * | | | | | | | | | | | | | | | | | Merge "KeyGeneratorTest: add key sizes for HmacSHA224"Kenny Root2013-09-301-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | KeyGeneratorTest: add key sizes for HmacSHA224Kenny Root2013-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd19193646a861744df14bb323fd9d2a5d28f3fc
* | | | | | | | | | | | | | | | | | | | | am 19fcf4fb: am 1f847e4a: Merge "Add benchmark for SSL loopback"Kenny Root2013-09-291-0/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19fcf4fb17cb32545b0eed206c07bd1b457f8946': Add benchmark for SSL loopback
| * | | | | | | | | | | | | | | | | | | | am 1f847e4a: Merge "Add benchmark for SSL loopback"Kenny Root2013-09-291-0/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f847e4a7a1eafd7b5fdcf3c388beeb641025fb1': Add benchmark for SSL loopback
| | * | | | | | | | | | | | | | | | | | | Merge "Add benchmark for SSL loopback"Kenny Root2013-09-291-0/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Add benchmark for SSL loopbackKenny Root2013-09-291-0/+61
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb05ee34f4398ad61e047d1a7ecfcea9a787b6ca
* | | | | | | | | | | | | | | | | | | | am 7cfeda52: am eaadab23: Merge "Conscrypt: correct key selection with no ↵Kenny Root2013-09-272-3/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sigAlg" * commit '7cfeda529144082aafd237e54c6059b127cb03db': Conscrypt: correct key selection with no sigAlg
| * | | | | | | | | | | | | | | | | | | am eaadab23: Merge "Conscrypt: correct key selection with no sigAlg"Kenny Root2013-09-272-3/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaadab232747743d8ee6891954a2d0f11f4826bd': Conscrypt: correct key selection with no sigAlg
| | * | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KeyManagerImpl was changed to support the "EC_EC" and "EC_RSA" key types in the StandardNames document. The intention of those aliases are to require a certain signature type. If it is missing, it should accept any signature type as before. However, it was erroneously requiring the same signature type as the key type if it was missing. This causes RSA client certificates signed by an EC key, for instance, to fail. Bug: 10966884 Change-Id: I298bf65ac4c607ae13e24b44fb1b52ec341f9fcf
* | | | | | | | | | | | | | | | | | | | am 67efc155: am 0e7ab99d: Merge "Conscrypt: add SHA-224 with tests"Kenny Root2013-09-268-7/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67efc155f685136b3f493aa69a76b1cddcc024cb': Conscrypt: add SHA-224 with tests
| * | | | | | | | | | | | | | | | | | | am 0e7ab99d: Merge "Conscrypt: add SHA-224 with tests"Kenny Root2013-09-268-7/+231
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e7ab99d21c56c1a58eb913e460658bfbc37519b': Conscrypt: add SHA-224 with tests
| | * | | | | | | | | | | | | | | | | | Merge "Conscrypt: add SHA-224 with tests"Kenny Root2013-09-268-7/+231
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Conscrypt: add SHA-224 with testsKenny Root2013-09-268-7/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHA-224 has made a comeback in the latest StandardNames documentation. This change adds tests for SHA-224 and also Conscrypt providers for things we have code paths to support. Change-Id: I8c200082ff76ee4ae38b6efaa16e6741b33b7f5b
* | | | | | | | | | | | | | | | | | | | | am 12a9d99b: am 670023f1: Merge "Add CAP_BLOCK_SUSPEND to OS constants"Michael Wright2013-09-263-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12a9d99bc8b7a4972a382fcd78ef24e2ac0a4233': Add CAP_BLOCK_SUSPEND to OS constants
| * | | | | | | | | | | | | | | | | | | | am 670023f1: Merge "Add CAP_BLOCK_SUSPEND to OS constants"Michael Wright2013-09-263-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '670023f161f2be66c285f5ce1556aeb219571a61': Add CAP_BLOCK_SUSPEND to OS constants
| | * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10901016 Change-Id: I162bde82bce9fca8eabc7168a172d3d8365e1578
* | | | | | | | | | | | | | | | | | | | | | am 8d71cebf: am 215ea709: Merge "Fix exceptions thrown in tests"Kenny Root2013-09-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d71cebf809d77e53236ada8f8f30ce3218f929b': Fix exceptions thrown in tests
| * | | | | | | | | | | | | | | | | | | | | am 215ea709: Merge "Fix exceptions thrown in tests"Kenny Root2013-09-251-24/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '215ea709c700f1a7dabf98744f03a760d78e4586': Fix exceptions thrown in tests
| | * | | | | | | | | | | | | | | | | | | | Merge "Fix exceptions thrown in tests"Kenny Root2013-09-251-24/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fix exceptions thrown in testsKenny Root2013-09-251-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1327511d4347550111334fb858053a8cd8c3109
* | | | | | | | | | | | | | | | | | | | | | Fix exceptions thrown in testsKenny Root2013-09-251-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 325e5492a9d294f9d5a9752103f5ce96df2c4095) Change-Id: Ibc9e0f5de47718e0338e25536e0db245ca761664