summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-02-01Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstreamSergio Giro
2016-02-01Merge "Update elements in android tree as in aosp and goog ToT" into upstream...Sergio Giro
2016-02-01Update elements in android tree as in aosp and goog ToTSergio Giro
2016-02-01Merge "bouncycastle: Android tree with upstream code for version 1.52" into u...bouncycastle-upstream_mnc-drbouncycastle-upstream_mncSergio Giro
2016-02-01bouncycastle: Android tree with upstream code for version 1.52Sergio Giro
2016-01-29Merge "Update elements in android tree as in mnc-dev" into upstream-masterSergio Giro
2016-01-29Update elements in android tree as in mnc-devSergio Giro
2016-01-28Merge "bouncycastle: Android tree with upstream code for version 1.50" into u...bouncycastle-upstream_lmp-mr1bouncycastle-upstream_lmpSergio Giro
2016-01-28bouncycastle: Android tree with upstream code for version 1.50Sergio Giro
2016-01-27Merge "Update elements in android tree as in lmp-dev" into upstream-masterSergio Giro
2016-01-26Update elements in android tree as in lmp-devSergio Giro
2016-01-25Merge "bouncycastle: Android tree with upstream code for version 1.49" into u...bouncycastle-upstream_klpbouncycastle-upstream_01-49Sergio Giro
2016-01-25bouncycastle: Android tree with upstream code for version 1.49Sergio Giro
2015-12-30Merge "Add core-oj to the list of dependencies" am: 9b30eb05e5Narayan Kamath
2015-12-30Merge "Add core-oj to the list of dependencies"Narayan Kamath
2015-12-30Merge "Add core-oj to the list of dependencies"brillo-m9-releasebrillo-m9-devNarayan Kamath
2015-12-23Merge "Expose PSS AlgorithmParameters to JCA." am: 81cafc9f97Alex Klyubin
2015-12-23DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-12-23DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-12-23DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-12-23DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-12-22Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
2015-12-06merge in nyc-release history after reset to masterThe Android Automerger
2015-12-01bouncycastle: limit input length as specified by the NIST specSergio Giro
2015-12-01merge in nyc-release history after reset to masterThe Android Automerger
2015-11-30Follow-up to previous DSA key checkKenny Root
2015-11-26merge in nyc-release history after reset to masterThe Android Automerger
2015-11-26Merge "Expose PSS AlgorithmParameters to JCA." am: 81cafc9f97Alex Klyubin
2015-11-25Merge "Expose PSS AlgorithmParameters to JCA."Alex Klyubin
2015-11-25Merge "Expose PSS AlgorithmParameters to JCA."Alex Klyubin
2015-11-25Merge "Expose PSS AlgorithmParameters to JCA."brillo-m8-releasebrillo-m8-devAlex Klyubin
2015-11-23Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
2015-11-23merge in nyc-release history after reset to masterThe Android Automerger
2015-11-20Expose PSS AlgorithmParameters to JCA.Alex Klyubin
2015-11-20Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-20DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST specSergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...marshmallow-dr1.5-devSergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST specSergio Giro
2015-11-19DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec a...Sergio Giro