summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* GCMParameters: in ASN1 encoding, use 12 when no value is specifiedcm-12.1Sergio Giro2016-09-121-12/+3
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-041-3/+12
|\
| * GCMParameters: fix insecure tag sizeSergio Giro2016-02-261-3/+12
* | Merge tag 'android-5.1.1_r33' into HEADJessica Wagantall2016-01-042-74/+185
|\|
| * DO NOT MERGE bouncycastle: limit input length as specified by the NIST specSergio Giro2015-11-302-74/+185
* | Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-103-25/+29
|\|
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-100-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-090-0/+0
| |/| |/|/
| * Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-053-25/+29
|/
* 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