summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.0Brian Carlstrom2014-07-100-0/+0
|\
| * am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-101-0/+10
| |\
| | * Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-101-0/+10
| | |\
| | | * Adding unbundled build target for bouncycastleJerome Poichet2014-07-091-0/+10
| | |/
* | | Adding unbundled build target for bouncycastleJerome Poichet2014-07-091-0/+10
* | | am fe42c018: am 0ad83c12: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-191-2/+2
|\| |
| * | am 0ad83c12: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-191-2/+2
| |\|
| | * Merge "Switch from core to core-libart"Brian Carlstrom2014-06-191-2/+2
| | |\
| | | * Switch from core to core-libartBrian Carlstrom2014-06-181-2/+2
| | |/
* | | am 4cce0bff: am ffb23a4c: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-111-2/+0
|\| |
| * | am ffb23a4c: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-101-2/+0
| |\|
| | * Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-101-2/+0
| | |\
| | | * Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-081-2/+0
| | |/
* | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-220-0/+0
|\ \ \
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-220-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-210-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-200-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-190-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-180-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-170-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-150-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-140-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-130-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-120-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-110-0/+0
|/| | |
| * | | merge in master-release history after reset to 7a1a9d857a535231c59391a6e7fb2e...The Android Automerger2014-05-100-0/+0
|/| | |
| * | | merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger2014-05-080-0/+0
| |\ \ \
| | * | | merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger2014-05-070-0/+0
| |/| | |
| | * | | merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger2014-05-070-0/+0
| |/| | |
| | * | | merge in master-release history after reset to 0d3f1d2873d0cdfa2b7e00671de99f...The Android Automerger2014-05-060-0/+0
| |/| | |
| | * | | merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger2014-05-050-0/+0
| | |\ \ \
| | | * | | merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger2014-05-040-0/+0
| | |/| | |
| | | * | | merge in master-release history after reset to a7666b863a60476c822d88ae1e0ba1...The Android Automerger2014-05-030-0/+0
| | |/| | |
| | | * | | 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
| | | |\ \ \