summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-14merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger
2014-05-13merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger
2014-05-12merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger
2014-05-11merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger
2014-05-10merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger
2014-05-08am c8d5982f: am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root
2014-05-08merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger
2014-05-08am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root
2014-05-08am f22ddb7b: Merge "Add OID for Diffie-Hellman keys"Kenny Root
2014-05-08Merge "Add OID for Diffie-Hellman keys"Kenny Root
2014-05-07Add OID for Diffie-Hellman keysKenny Root
2014-05-07merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger
2014-05-07merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger
2014-05-06merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger
2014-05-05am c35b4982: am 00206913: am 5109ec05: Merge "Remove static initializer from ...Kenny Root
2014-05-05am 00206913: am 5109ec05: Merge "Remove static initializer from StreamUtil"Kenny Root
2014-05-05am 5109ec05: Merge "Remove static initializer from StreamUtil"Kenny Root
2014-05-05Merge "Remove static initializer from StreamUtil"Kenny Root
2014-05-05Remove static initializer from StreamUtilKenny Root
2014-05-05merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger
2014-05-04merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger
2014-05-03merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger
2014-05-01merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger
2014-04-30merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger
2014-04-30am d2aac75a: am 66d29e68: am b0bd6578: Merge "OpenSSLDigest: length to length...Kenny Root
2014-04-30am dbe5dd0f: am c9ad0e79: am 0620ff90: Merge "OpenSSLDigest needs to be Exten...Kenny Root
2014-04-30am de4459d1: am ee809721: am 684e45f9: Merge "OpenSSLDigest: use delegate model"Kenny Root
2014-04-30am 66d29e68: am b0bd6578: Merge "OpenSSLDigest: length to length-offset"Kenny Root
2014-04-30am c9ad0e79: am 0620ff90: Merge "OpenSSLDigest needs to be ExtendedDigest"Kenny Root
2014-04-30am ee809721: am 684e45f9: Merge "OpenSSLDigest: use delegate model"Kenny Root
2014-04-29merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger
2014-04-28merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger
2014-04-27merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger
2014-04-26merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger
2014-04-24merge in master-release history after reset to 4911752a3b147cb3819d8615f6d722...The Android Automerger
2014-03-28am 68685087: am 913c25a4: am 66431ff0: am 217f2f35: (-s ours) resolved confli...Brian Carlstrom
2014-03-28am 913c25a4: am 66431ff0: am 217f2f35: (-s ours) resolved conflicts for merge...Brian Carlstrom
2014-03-28am 66431ff0: am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 ...Brian Carlstrom
2014-03-28am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 to jb-mr2-dev...Brian Carlstrom
2014-03-27resolved conflicts for merge of 78cfdf68 to jb-mr2-dev-plus-aospBrian Carlstrom
2014-03-27am 0aec3d0b: resolved conflicts for merge of f0fb04bc to jb-mr1-dev-plus-aospBrian Carlstrom
2014-03-27resolved conflicts for merge of f0fb04bc to jb-mr1-dev-plus-aospBrian Carlstrom
2014-03-27am 140a5e37: am 79c4cebc: am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9:...Brian Carlstrom
2014-03-27am 79c4cebc: am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5:...Brian Carlstrom
2014-03-27am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c:...Brian Carlstrom
2014-03-27am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579:...Brian Carlstrom
2014-03-27am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit...Brian Carlstrom
2014-03-27am e115d3d3: am 1fa80443: resolved conflicts for merge of 67657197 to jb-mr1-devBrian Carlstrom
2014-03-27am 1fa80443: resolved conflicts for merge of 67657197 to jb-mr1-devBrian Carlstrom
2014-03-27am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\'...Brian Carlstrom