aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Split the core/platform API into stable and legacy versions. am: 8a6152b03a a...HEADmasterPete Gillin2020-06-091-1/+1
|\
| * Split the core/platform API into stable and legacy versions. am: 8a6152b03aPete Gillin2020-06-091-1/+1
| |\
| | * Split the core/platform API into stable and legacy versions.android-r-beta-3android-r-beta-2Pete Gillin2020-06-031-1/+1
| |/
* | Remove deprecated BouncyCastle algorithms am: 013daa2841 am: 2c75c3e2c1Daulet Zhanguzin2020-05-139-13/+70
|\|
| * Remove deprecated BouncyCastle algorithms am: 013daa2841Daulet Zhanguzin2020-05-139-13/+70
| |\
| | * Remove deprecated BouncyCastle algorithmsDaulet Zhanguzin2020-05-069-13/+70
* | | Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 am:...Jack He2020-05-059-70/+13
|\| |
| * | Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46Jack He2020-05-059-70/+13
| |\|
| | * Merge "Revert "Remove deprecated BouncyCastle algorithms""Jack He2020-05-059-70/+13
| | |\
| | | * Revert "Remove deprecated BouncyCastle algorithms"Jack He2020-05-059-70/+13
* | | | Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9 am: 6da408c351Daulet Zhanguzin2020-05-049-13/+70
|\| | |
| * | | Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9Daulet Zhanguzin2020-05-049-13/+70
| |\| |
| | * | Merge "Remove deprecated BouncyCastle algorithms"Daulet Zhanguzin2020-05-049-13/+70
| | |\|
| | | * Remove deprecated BouncyCastle algorithmsDaulet Zhanguzin2020-05-029-13/+70
* | | | Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530 am: 059caa19f7Bob Badour2020-04-291-0/+3
|\| | |
| * | | Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530Bob Badour2020-04-291-0/+3
| |\| |
| | * | Add METADATA to wycheproof: Apache2=NOTICEBob Badour2020-04-281-0/+3
| | |/
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
|\| |
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \
| | * \ Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: 24807d9b5fPaul Duffin2020-04-091-1/+1
| | |\ \ | | |/ / | |/| |
| | * | Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83Bob Badour2020-03-301-202/+0
| | |\ \
* | | | | Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: 24807d9b5fPaul Duffin2020-04-091-1/+1
|\| | | |
| * | | | Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3Paul Duffin2020-04-091-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Depend on conscrypt.module.platform.api not stubsPaul Duffin2020-04-081-1/+1
* | | | Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83Bob Badour2020-03-301-202/+0
|\| | |
| * | | Remove redundant NOTICE copied from LICENSE. am: 217dd213c0Bob Badour2020-03-301-202/+0
| |\| | | | |/ | |/|
| | * Remove redundant NOTICE copied from LICENSE.Bob Badour2020-03-251-202/+0
| |/
* | wycheproof: Delegate to conscrypt OWNERS. am: d9fb540d13 am: 079ebd5392 am: d...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-031-4/+2
|\|
| * wycheproof: Delegate to conscrypt OWNERS. am: d9fb540d13 am: 079ebd5392android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2020-01-031-4/+2
| |\
| | * wycheproof: Delegate to conscrypt OWNERS.Tobias Thierer2020-01-031-4/+2
| | |\
| | | * wycheproof: Delegate to conscrypt OWNERS.android-r-preview-1Tobias Thierer2020-01-021-4/+2
| | |/
* | | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
|\| |
| * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| |\|
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| | |\
* | | | Build wycheproof against ART and Conscrypt module's platform API am: 2606e10c...Paul Duffin2019-10-081-3/+2
|\| | |
| * | | Build wycheproof against ART and Conscrypt module's platform API am: 2606e10c...Paul Duffin2019-10-081-3/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Build wycheproof against ART and Conscrypt module's platform API am: 2606e10c83Paul Duffin2019-10-081-3/+2
| | |\|
| | | * Build wycheproof against ART and Conscrypt module's platform APIPaul Duffin2019-10-081-3/+2
| | | |\
| | | | * Build wycheproof against ART and Conscrypt module's platform APIndk-sysroot-r21Paul Duffin2019-10-041-3/+2
* | | | | Stop depending on core-system-modules am: 6663e964b7 am: 787c9996b7 am: 9678c...Paul Duffin2019-09-271-1/+3
|\| | | |
| * | | | Stop depending on core-system-modules am: 6663e964b7 am: 787c9996b7Paul Duffin2019-09-271-1/+3
| |\| | |
| | * | | Stop depending on core-system-modules am: 6663e964b7Paul Duffin2019-09-271-1/+3
| | |\| |
| | | * | Stop depending on core-system-modulesPaul Duffin2019-09-271-1/+3
| | | |\|
| | | | * Stop depending on core-system-modulesPaul Duffin2019-09-261-1/+3
* | | | | Remove duplicate libraries that are provided by system modules am: 26e8acb9aa...Paul Duffin2019-09-231-5/+1
|\| | | |
| * | | | Remove duplicate libraries that are provided by system modules am: 26e8acb9aa...Paul Duffin2019-09-231-5/+1
| |\| | |
| | * | | Remove duplicate libraries that are provided by system modules am: 26e8acb9aaPaul Duffin2019-09-231-5/+1
| |/| | | | | |/ /
| | * / Remove duplicate libraries that are provided by system modulesPaul Duffin2019-09-231-5/+1
| |/| | | | |/
| | * Remove duplicate libraries that are provided by system modulesPaul Duffin2019-09-201-5/+1
* | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-010-0/+0
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-13 17:39:16 +0000