android_external_bouncycastle - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	am 2d8d9ce0: resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp	Brian Carlstrom	2013-02-04	1	-2/+2
\|\
\| *	resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp	Brian Carlstrom	2013-02-01	2	-8/+24
\| \|\
\| \| *	am c4c8087c: Add certs to blacklist.	Geremy Condra	2013-02-01	2	-120/+134
\| \| \|\
\| \| \| *	Add certs to blacklist.	Geremy Condra	2013-01-22	2	-120/+134
* \| \| \|	am b8bddcfe: Merge "Restore PBE Cipher wrap and unwrap support from upstream"	Brian Carlstrom	2013-01-29	6	-4/+543
\|\\| \| \|
\| * \| \|	Merge "Restore PBE Cipher wrap and unwrap support from upstream"	Brian Carlstrom	2013-01-30	6	-4/+543
\| \|\ \ \
\| \| * \| \|	Restore PBE Cipher wrap and unwrap support from upstream	Brian Carlstrom	2013-01-29	6	-4/+543
\| \|/ / /
* \| \| \|	am 6c392aa7: Merge "Add getIssuerAlternativeNames() to JCE API"	Kenny Root	2013-01-18	3	-7/+20
\|\\| \| \|
\| * \| \|	Merge "Add getIssuerAlternativeNames() to JCE API"	Kenny Root	2013-01-18	3	-7/+20
\| \|\ \ \
\| \| * \| \|	Add getIssuerAlternativeNames() to JCE API	Kenny Root	2013-01-16	3	-7/+20
\| \|/ / /
* \| \| \|	resolved conflicts for merge of f1d78c98 to master	Kenny Root	2013-01-17	2	-96/+112
\|\\| \| \|
\| * \| \|	Merge "Fix patch generation timestamps"	Kenny Root	2013-01-17	2	-118/+132
\| \|\ \ \
\| \| * \| \|	Fix patch generation timestamps	Kenny Root	2013-01-16	2	-118/+132
\| \|/ / /
* \| \| \|	Add certs to blacklist.	Geremy Condra	2013-01-15	2	-121/+135
* \| \| \|	resolved conflicts for merge of 73f666df to master	Kenny Root	2013-01-09	5	-10/+188
\|\\| \| \|
\| * \| \|	Merge "Add getSubjectAlternativeNames() to certificate JCE"	Kenny Root	2013-01-07	5	-10/+188
\| \|\ \ \
\| \| * \| \|	Add getSubjectAlternativeNames() to certificate JCE	Kenny Root	2013-01-07	5	-10/+188
\| \|/ / /
* \| \| \|	am b61009d9: Merge "Simplify makefile."	Elliott Hughes	2012-12-05	1	-2/+0
\|\\| \| \|
\| * \| \|	Merge "Simplify makefile."	Elliott Hughes	2012-12-04	1	-2/+0
\| \|\ \ \
\| \| * \| \|	Simplify makefile.	Elliott Hughes	2012-12-04	1	-2/+0
\| \|/ / /
* \| \| \|	am f81fa0e5: (-s ours) am 1508faa5: Reconcile with jb-mr1-factory-release jb-...	The Android Open Source Project	2012-11-06	0	-0/+0
\|\\| \| \|
\| * \| \|	am 1508faa5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge	The Android Open Source Project	2012-11-06	0	-0/+0
\| \|\\| \|
\| \| \| \
\| \| \| \
\| \| *-. \	Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge	The Android Open Source Project	2012-11-06	0	-0/+0
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	am b24e661c: (-s ours) Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-11-02	0	-0/+0
\|\\| \| \| \|
\| * \| \| \|	Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-11-02	0	-0/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	merge in jb-mr1-release history after reset to jb-mr1-devcm-10.1-M1	The Android Automerger	2012-11-01	0	-0/+0
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| / \| \| \| \|/
* \| \| \|	resolved conflicts for merge of 52112f9f to master	Brian Carlstrom	2012-11-01	2	-119/+128
\|\\| \| \|
\| * \| \|	am 036093e8: Fix registration of MD5withRSA Signatures	Brian Carlstrom	2012-11-01	2	-23/+32
\| \|\\| \|
\| \| * \|	Fix registration of MD5withRSA Signatures	Brian Carlstrom	2012-11-01	2	-23/+32
* \| \| \|	resolved conflicts for merge of 9912a9c8 to master	Kenny Root	2012-10-12	3	-7/+91
\|\\| \| \|
\| * \| \|	Fix non-BC EC private key usage	Kenny Root	2012-10-12	3	-7/+91
* \| \| \|	am ad5d6d32: (-s ours) am 71050d26: (-s ours) am 5db429c3: (-s ours) Merge "F...	Kenny Root	2012-10-12	0	-0/+0
\|\\| \| \|
\| * \| \|	am 71050d26: (-s ours) am 5db429c3: (-s ours) Merge "Fix non-BC EC private ke...	Kenny Root	2012-10-12	0	-0/+0
\| \|\ \ \
\| \| * \ \	am 5db429c3: (-s ours) Merge "Fix non-BC EC private key usage DO NOT MERGE"	Kenny Root	2012-10-12	0	-0/+0
\| \| \|\ \ \
\| \| \| * \| \|	Merge "Fix non-BC EC private key usage DO NOT MERGE"	Kenny Root	2012-10-11	3	-7/+91
\| \| \|/\| \| \|
\| \| \| * \| \|	Fix non-BC EC private key usage DO NOT MERGE	Kenny Root	2012-10-11	3	-7/+91
\| \| \|/ / /
* \| \| \| \|	Allow CipherTest to run on RI	Brian Carlstrom	2012-09-28	3	-99/+110
* \| \| \| \|	am c05c993c: (-s ours) Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-09-20	0	-0/+0
\|\\| \| \| \|
\| * \| \| \|	Reconcile with jb-mr1-release - do not merge	The Android Open Source Project	2012-09-20	0	-0/+0
\|/\| \| \| \| \| \| \|_\|/ \| \|/\| \|
\| * \| \|	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-09-20	0	-0/+0
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-09-14	0	-0/+0
\| \| \|\ \
\| \| \| * \	merge in jb-mr1-release history after reset to jb-mr1-dev	The Android Automerger	2012-09-13	0	-0/+0
\| \| \| \|\ \
* \| \| \| \| \|	am e6bf3e8d: Make existing bouncycastle bcprov build on host and add host-onl...	Brian Carlstrom	2012-09-20	635	-448/+12998
\|\\| \| \| \| \|
\| * \| \| \| \|	Make existing bouncycastle bcprov build on host and add host-only bcpkix build	Brian Carlstrom	2012-09-19	635	-448/+12998
\| \|/ / / /
* \| \| \| \|	am 517da5b1: BaseKeyFactorySpi should throw InvalidKeySpecException, not Runt...	Brian Carlstrom	2012-09-14	4	-102/+219
\|\\| \| \| \|
\| * \| \| \|	BaseKeyFactorySpi should throw InvalidKeySpecException, not RuntimeExceptions	Brian Carlstrom	2012-09-14	4	-102/+219
\| \|/ / /
* \| \| \|	am 4c111300: bouncycastle 1.47 upgrade	Brian Carlstrom	2012-09-12	379	-18145/+24507
\|\\| \| \|
\| * \| \|	bouncycastle 1.47 upgrade	Brian Carlstrom	2012-09-10	379	-18145/+24507
* \| \| \|	Reconcile with jb-mr1-release	The Android Open Source Project	2012-07-30	0	-0/+0
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	am d7499861: am f3f6a9ca: am 61679c98: Merge changes I5394d299,I461dd742	Brian Carlstrom	2012-07-27	0	-0/+0
\| \|\ \ \| \|/ / \|/\| \|