| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 492f13b0: am 234720eb: Merge "Adding unbundled build target for bouncycastle"staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0 | Brian Carlstrom | 2014-07-10 | 0 | -0/+0 |
| |\ | | | | | | | | | * commit '492f13b096cd62198a801c603bb8c231c06c1b8e': Adding unbundled build target for bouncycastle | ||||
| | * | am 234720eb: Merge "Adding unbundled build target for bouncycastle" | Brian Carlstrom | 2014-07-10 | 1 | -0/+10 |
| | |\ | | | | | | | | | | | | | * commit '234720ebe66540a53cff98b2448dddbc884bd09f': Adding unbundled build target for bouncycastle | ||||
| | | * | Merge "Adding unbundled build target for bouncycastle" | Brian Carlstrom | 2014-07-10 | 1 | -0/+10 |
| | | |\ | |||||
| | | | * | Adding unbundled build target for bouncycastle | Jerome Poichet | 2014-07-09 | 1 | -0/+10 |
| | | |/ | | | | | | | | | | | | | | | | (cherry picked from commit 81870f19b44030096dd613379a152c4406c65cb3) Change-Id: I2a974bb050fb50b94045d1aa39da8ebd8c0ccd52 | ||||
| * | | | Adding unbundled build target for bouncycastle | Jerome Poichet | 2014-07-09 | 1 | -0/+10 |
| | | | | | | | | | | | | | Change-Id: I35000ec43c7e708f4fd99ce96d336bfab8659d20 | ||||
| * | | | am fe42c018: am 0ad83c12: Merge "Switch from core to core-libart" | Brian Carlstrom | 2014-06-19 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | * commit 'fe42c0184d3a0bef34d112e021dc7dda7799d1ee': Switch from core to core-libart | ||||
| | * | | am 0ad83c12: Merge "Switch from core to core-libart" | Brian Carlstrom | 2014-06-19 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | * commit '0ad83c123e6529e1e2a87cceb2c6e78c013d895b': Switch from core to core-libart | ||||
| | | * | Merge "Switch from core to core-libart" | Brian Carlstrom | 2014-06-19 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Switch from core to core-libart | Brian Carlstrom | 2014-06-18 | 1 | -2/+2 |
| | | |/ | | | | | | | | | | | | | Bug: 14298175 Change-Id: I6003d2a3f9c5e254632e8a67bfee0c11ea0348f3 | ||||
| * | | | am 4cce0bff: am ffb23a4c: Merge "Remove deprecated WITH_HOST_DALVIK." | Ian Rogers | 2014-06-11 | 1 | -2/+0 |
| |\| | | | | | | | | | | | | | | * commit '4cce0bff08f526f3652c0323bf6d7e71dd3edea4': Remove deprecated WITH_HOST_DALVIK. | ||||
| | * | | am ffb23a4c: Merge "Remove deprecated WITH_HOST_DALVIK." | Ian Rogers | 2014-06-10 | 1 | -2/+0 |
| | |\| | | | | | | | | | | | | | * commit 'ffb23a4c8d70763aa29b048fbe43ac409db2d22d': Remove deprecated WITH_HOST_DALVIK. | ||||
| | | * | Merge "Remove deprecated WITH_HOST_DALVIK." | Ian Rogers | 2014-06-10 | 1 | -2/+0 |
| | | |\ | |||||
| | | | * | Remove deprecated WITH_HOST_DALVIK. | Ian Rogers | 2014-06-08 | 1 | -2/+0 |
| | | |/ | | | | | | | | | | | | | Bug: 13751317 Change-Id: Ie3b57c7f592cfdd478bdee0f1f6c0ea76d3ee418 | ||||
| * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-22 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-22 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-21 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-20 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-19 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-18 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-17 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-15 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-14 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-13 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-12 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-11 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-10 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | | | 7a1a9d857a535231c59391a6e7fb2e9e261610ab | ||||
| | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-08 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | 0d3f1d2873d0cdfa2b7e00671de99fc5e0c75bc0 | ||||
| | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-07 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | | | | 0d3f1d2873d0cdfa2b7e00671de99fc5e0c75bc0 | ||||
| | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-07 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | | | | 0d3f1d2873d0cdfa2b7e00671de99fc5e0c75bc0 | ||||
| | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-06 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | | | | 0d3f1d2873d0cdfa2b7e00671de99fc5e0c75bc0 | ||||
| | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-05 | 0 | -0/+0 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | a7666b863a60476c822d88ae1e0ba1b707e91812 | ||||
| | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-04 | 0 | -0/+0 |
| | | |/| | | | | | | | | | | | | | | | | | | | | | a7666b863a60476c822d88ae1e0ba1b707e91812 | ||||
| | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-03 | 0 | -0/+0 |
| | | |/| | | | | | | | | | | | | | | | | | | | | | a7666b863a60476c822d88ae1e0ba1b707e91812 | ||||
| | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-05-01 | 0 | -0/+0 |
| | | |/| | | | | | | | | | | | | | | | | | | | | | a7666b863a60476c822d88ae1e0ba1b707e91812 | ||||
| | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-30 | 0 | -0/+0 |
| | | |/| | | | | | | | | | | | | | | | | | | | | | a7666b863a60476c822d88ae1e0ba1b707e91812 | ||||
| | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-29 | 0 | -0/+0 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | 4911752a3b147cb3819d8615f6d7222cb92ab3af | ||||
| | | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-28 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4911752a3b147cb3819d8615f6d7222cb92ab3af | ||||
| | | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-27 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4911752a3b147cb3819d8615f6d7222cb92ab3af | ||||
| | | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-26 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4911752a3b147cb3819d8615f6d7222cb92ab3af | ||||
| | | | | * | | | merge in master-release history after reset to ↵ | The Android Automerger | 2014-04-24 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4911752a3b147cb3819d8615f6d7222cb92ab3af | ||||
| | | | | * | | | Merge "OpenSSLDigest: length to length-offset" | Kenny Root | 2014-02-27 | 2 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | am c8d5982f: am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys" | Kenny Root | 2014-05-08 | 2 | -2/+39 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | * commit 'c8d5982f30f47cf8674cf2c31370ed52aaaa5c7d': Add OID for Diffie-Hellman keys | ||||
| | * | | | | | am 8a7034bc: am f22ddb7b: Merge "Add OID for Diffie-Hellman keys" | Kenny Root | 2014-05-08 | 2 | -2/+39 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | * commit '8a7034bca063f9248a697c5aab67259798827f97': Add OID for Diffie-Hellman keys | ||||
| | | * | | | | am f22ddb7b: Merge "Add OID for Diffie-Hellman keys" | Kenny Root | 2014-05-08 | 2 | -2/+39 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f22ddb7b0b277be1dd272b29857ad552f82a4324': Add OID for Diffie-Hellman keys | ||||
| | | | * \ \ \ | Merge "Add OID for Diffie-Hellman keys" | Kenny Root | 2014-05-08 | 2 | -2/+39 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Add OID for Diffie-Hellman keys | Kenny Root | 2014-05-07 | 2 | -2/+39 |
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, decoding X.509 certificates doesn't get a valid DH public key since this OID is not registered by any other provider. Change-Id: I82a5e4cfc3b63c3928299523725d24b838ca939c | ||||
| * | | | / / / | am c35b4982: am 00206913: am 5109ec05: Merge "Remove static initializer from ↵ | Kenny Root | 2014-05-05 | 2 | -3/+40 |
| |\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StreamUtil" * commit 'c35b4982b5acc440b9adb7bbc1225ecad1745653': Remove static initializer from StreamUtil | ||||
| | * | | | | | am 00206913: am 5109ec05: Merge "Remove static initializer from StreamUtil" | Kenny Root | 2014-05-05 | 2 | -3/+40 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '002069133893d1ade0241723ed05aea1ec4a3d8c': Remove static initializer from StreamUtil | ||||
| | | * | | | | am 5109ec05: Merge "Remove static initializer from StreamUtil" | Kenny Root | 2014-05-05 | 2 | -3/+40 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5109ec0544f566b5a2e5298a03b1ecd1d6538cca': Remove static initializer from StreamUtil | ||||
| | | | * | | | Merge "Remove static initializer from StreamUtil" | Kenny Root | 2014-05-05 | 2 | -3/+40 |
| | | | |\ \ \ | |||||
 |
index : android_external_bouncycastle | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |