summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger2014-05-010-0/+0
| | |/| | |
| | | * | | merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger2014-04-300-0/+0
| | |/| | |
| | | * | | merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger2014-04-290-0/+0
| | | |\ \ \
| | | | * | | merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger2014-04-280-0/+0
| | | |/| | |
| | | | * | | merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger2014-04-270-0/+0
| | | |/| | |
| | | | * | | merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger2014-04-260-0/+0
| | | |/| | |
| | | | * | | merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger2014-04-240-0/+0
| | | |/| | |
| | | | * | | Merge "OpenSSLDigest: length to length-offset"Kenny Root2014-02-272-3/+3
* | | | | | | am c8d5982f: am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root2014-05-082-2/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root2014-05-082-2/+39
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root2014-05-082-2/+39
| | |\ \ \ \
| | | * \ \ \ Merge "Add OID for Diffie-Hellman keys"Kenny Root2014-05-082-2/+39
| | | |\ \ \ \
| | | | * | | | Add OID for Diffie-Hellman keysKenny Root2014-05-072-2/+39
| | | |/ / / /
* | | | / / / am c35b4982: am 00206913: am 5109ec05: Merge "Remove static initializer from ...Kenny Root2014-05-052-3/+40
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | am 00206913: am 5109ec05: Merge "Remove static initializer from StreamUtil"Kenny Root2014-05-052-3/+40
| |\| | | |
| | * | | | am 5109ec05: Merge "Remove static initializer from StreamUtil"Kenny Root2014-05-052-3/+40
| | |\| | |
| | | * | | Merge "Remove static initializer from StreamUtil"Kenny Root2014-05-052-3/+40
| | | |\ \ \
| | | | * | | Remove static initializer from StreamUtilKenny Root2014-05-052-3/+40
| | | |/ / /
* | | | | | am d2aac75a: am 66d29e68: am b0bd6578: Merge "OpenSSLDigest: length to length...Kenny Root2014-04-300-0/+0
|\| | | | |
| * | | | | am 66d29e68: am b0bd6578: Merge "OpenSSLDigest: length to length-offset"Kenny Root2014-04-300-0/+0
| |\| | | |
| | * | | | am b0bd6578: Merge "OpenSSLDigest: length to length-offset"Kenny Root2014-03-112-3/+3
| | |\| | |
* | | | | | am dbe5dd0f: am c9ad0e79: am 0620ff90: Merge "OpenSSLDigest needs to be Exten...Kenny Root2014-04-300-0/+0
|\| | | | |
| * | | | | am c9ad0e79: am 0620ff90: Merge "OpenSSLDigest needs to be ExtendedDigest"Kenny Root2014-04-300-0/+0
| |\| | | |
| | * | | | am 0620ff90: Merge "OpenSSLDigest needs to be ExtendedDigest"Kenny Root2014-03-112-22/+40
| | |\ \ \ \
* | | | | | | am de4459d1: am ee809721: am 684e45f9: Merge "OpenSSLDigest: use delegate model"Kenny Root2014-04-300-0/+0
|\| | | | | | | |_|_|_|/ / |/| | | | |
| * | | | | am ee809721: am 684e45f9: Merge "OpenSSLDigest: use delegate model"Kenny Root2014-04-300-0/+0
| |\| | | |
| | * | | | am 684e45f9: Merge "OpenSSLDigest: use delegate model"Kenny Root2014-03-112-209/+53
| | |\ \ \ \
* | | | | | | am 68685087: am 913c25a4: am 66431ff0: am 217f2f35: (-s ours) resolved confli...Brian Carlstrom2014-03-280-0/+0
|\| | | | | |
| * | | | | | am 913c25a4: am 66431ff0: am 217f2f35: (-s ours) resolved conflicts for merge...Brian Carlstrom2014-03-280-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 66431ff0: am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 ...Brian Carlstrom2014-03-280-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 to jb-mr2-dev...Brian Carlstrom2014-03-280-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ resolved conflicts for merge of 78cfdf68 to jb-mr2-dev-plus-aospBrian Carlstrom2014-03-272-6/+14
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 0aec3d0b: resolved conflicts for merge of f0fb04bc to jb-mr1-dev-plus-aospBrian Carlstrom2014-03-272-6/+14
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ resolved conflicts for merge of f0fb04bc to jb-mr1-dev-plus-aospBrian Carlstrom2014-03-272-6/+14
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ am e115d3d3: am 1fa80443: resolved conflicts for merge of 67657197 to jb-mr1-devBrian Carlstrom2014-03-272-6/+14
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ am 1fa80443: resolved conflicts for merge of 67657197 to jb-mr1-devBrian Carlstrom2014-03-272-6/+14
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ resolved conflicts for merge of 67657197 to jb-mr1-devBrian Carlstrom2014-03-272-6/+14
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ am e2408598: Add ANSSI intermediate to the on-device blacklist.Geremy Condra2014-03-272-6/+14
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * | | | | | Add ANSSI intermediate to the on-device blacklist.Geremy Condra2014-03-272-6/+14
* | | | | | | | | | | | | | | | | am 140a5e37: am 79c4cebc: am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9:...Brian Carlstrom2014-03-270-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 79c4cebc: am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5:...Brian Carlstrom2014-03-270-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c:...Brian Carlstrom2014-03-270-0/+0
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579:...Brian Carlstrom2014-03-270-0/+0
| | | |\| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit...Brian Carlstrom2014-03-270-0/+0
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\'...Brian Carlstrom2014-03-270-0/+0
| | | | | |\| | | | | | | | | | |
| | | | | | * | | | | | | | | | | am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-devBrian Carlstrom2014-03-270-0/+0
| | | | | | |\| | | | | | | | | |
| | | | | | | * | | | | | | | | | am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-devBrian Carlstrom2014-03-270-0/+0
| | | | | | | |\| | | | | | | | |
| | | | | | | | * | | | | | | | | am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-devBrian Carlstrom2014-03-270-0/+0
| | | | | | | | |\| | | | | | | |
| | | | | | | | | * | | | | | | | Merge commit 'ac69e78f' into jb-mr1-devBrian Carlstrom2014-03-270-0/+0
| | | | | | | | | |\| | | | | | |
| | | | | | | | | | * | | | | | | am 6318d7cd: Add certs to blacklist.Geremy Condra2014-03-272-6/+22
| | | | | | | | | | |\| | | | | |