summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bouncycastle: upgrade to version 1.52Sergio Giro2015-04-20105-2648/+3941
* Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
|\
| * Remove -encoding UTF-8, it is now the defaultColin Cross2015-03-301-6/+0
|/
* am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
|\
| * Merge "Build bouncycastle-hostdex only on linux hosts."Narayan Kamath2015-01-071-2/+4
| |\
| | * Build bouncycastle-hostdex only on linux hosts.Narayan Kamath2015-01-061-2/+4
| |/
* | am 2a64eecc: Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-060-0/+0
|\ \
| * | Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-11-053-25/+29
* | | am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ...Kenny Root2014-10-250-0/+0
|\ \ \ | | |/ | |/|
| * | am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| |\ \
* | | | am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreload...Kenny Root2014-10-250-0/+0
|\| | |
| * | | am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| |\ \ \
* | | | | am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-250-0/+0
|\| | | |
| * | | | am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| |\ \ \ \
* | \ \ \ \ am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Avoid things that cause CertBlacklist to be preinitialized"Kenny Root2014-10-173-26/+30
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Avoid things that cause CertBlacklist to be preinitializedKenny Root2014-10-173-26/+30
* | | | | | am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
|\| | | | |
| * | | | | Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""Kenny Root2014-10-172-14/+10
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Revert "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-14/+10
* | | | | | am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
| |\| | | | | |/ / | |/| |
| | * | Put the CertBlacklist in a NoPreloadHolderKenny Root2014-10-162-10/+14
| |/ /
* | | am e46fd725: Merge "Upgrade to 1.51"Kenny Root2014-08-07287-6121/+21379
|\| |
| * | Merge "Upgrade to 1.51"Kenny Root2014-08-06287-6121/+21379
| |\ \
| | * | Upgrade to 1.51Kenny Root2014-08-06287-6121/+21379
| |/ /
* | | am dac96417: am 492f13b0: am 234720eb: Merge "Adding unbundled build target f...Brian Carlstrom2014-07-140-0/+0
|\ \ \ | | |/ | |/|
| * | 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
| | |\|
* | | | am 81870f19: Adding unbundled build target for bouncycastleJerome Poichet2014-07-140-0/+0
|\| | |
| * | | Adding unbundled build target for bouncycastleJerome Poichet2014-07-091-0/+10
* | | | am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-141-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
| |/ /
* | | 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
|/| | |