summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am b44aff7a: Merge "Remove -encoding UTF-8, it is now the default"Colin Cross2015-03-311-6/+0
|\
| * 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 75c09416: am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hos...Narayan Kamath2015-01-071-2/+4
|\|
| * 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 66020afc: am 2a64eecc: Avoid things that cause CertBlacklist to be preinit...Kenny Root2014-11-060-0/+0
|\| |
| * | 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 82a68225: am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBla...Kenny Root2014-10-260-0/+0
|\| | |
| * | | 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 c0144d74: am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist i...Kenny Root2014-10-260-0/+0
|\| | | |
| * | | | 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 312be539: am b000361b: am 74e779b0: Merge "Put the CertBlacklist in a NoPr...Kenny Root2014-10-260-0/+0
|\| | | | |
| * | | | | 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 0fd6b0bb: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be ...Kenny Root2014-10-173-26/+30
|\| | | | | |
| * | | | | | 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 482d26ec: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreload...Kenny Root2014-10-172-14/+10
|\| | | | | |
| * | | | | | 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 4d35838c: am 74e779b0: Merge "Put the CertBlacklist in a NoPreloadHolder"Kenny Root2014-10-172-10/+14
|\| | | | | |
| * | | | | | 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 9c4a275f: am e46fd725: Merge "Upgrade to 1.51"Kenny Root2014-08-07287-6121/+21379
|\| | |
| * | | 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 c426488f: am dac96417: am 492f13b0: am 234720eb: Merge "Adding unbundled b...Brian Carlstrom2014-07-140-0/+0
|\| | |
| * | | am dac96417: am 492f13b0: am 234720eb: Merge "Adding unbundled build target f...Brian Carlstrom2014-07-140-0/+0
| |\ \ \ | | | |/ | | |/|
* | | | am 71dbae7d: am 81870f19: Adding unbundled build target for bouncycastleJerome Poichet2014-07-140-0/+0
|\| | |
| * | | am 81870f19: Adding unbundled build target for bouncycastleJerome Poichet2014-07-140-0/+0
| |\ \ \
* | | | | am b148ef40: am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-140-0/+0
|\| | | | | |_|/ / |/| | |
| * | | am 234720eb: Merge "Adding unbundled build target for bouncycastle"Brian Carlstrom2014-07-141-0/+10
| |\ \ \ | | | |/ | | |/|
* | | | 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
| | |/