aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-09-23Merge "Layoutlib needs access to conscrypt" am: a04d03b054temp_sam_202323961Jerome Gaillard
2021-09-23Merge "Layoutlib needs access to conscrypt"Jerome Gaillard
2021-09-22Mark conscrypt-unbundled as enabled on Windows am: 6e404a34daDan Willemsen
2021-09-22Layoutlib needs access to conscryptJerome Gaillard
2021-09-20Mark conscrypt-unbundled as enabled on WindowsDan Willemsen
2021-09-02Mark conscrypt apex as compressible am: fe318a6d0dSamiul Islam
2021-09-02Mark conscrypt apex as compressibleandroid-s-beta-5android-s-beta-5Samiul Islam
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
2021-08-02Fix CheckJNI error am: 3a83c47b4d am: 6641a3d5c5Pete Bentley
2021-08-02Fix CheckJNI error am: 3a83c47b4dPete Bentley
2021-08-02Fix CheckJNI errorPete Bentley
2021-07-30Fix CheckJNI error (#1027)Pete Bentley
2021-07-27Re-land "Merge Conscrypt upstream master." am: f81aacca87 am: f0bb77ffcdPete Bentley
2021-07-27Re-land "Merge Conscrypt upstream master." am: f81aacca87Pete Bentley
2021-07-27Re-land "Merge Conscrypt upstream master."Pete Bentley
2021-07-26Extra JNI null checks and error fixes. am: d9d177a969 am: 303816c6fdPete Bentley
2021-07-26Extra JNI null checks and error fixes. am: d9d177a969Pete Bentley
2021-07-23Extra JNI null checks and error fixes.Pete Bentley
2021-07-23Update development module version number to 319999900 am: 7c386bb4efAdam Seaton
2021-07-23Revert "Merge Conscrypt upstream master." am: ff92d69db7 am: 30084bba6bForrest Dunlap
2021-07-23Revert "Merge Conscrypt upstream master." am: ff92d69db7Forrest Dunlap
2021-07-22Revert "Merge Conscrypt upstream master."Forrest Dunlap
2021-07-22Merge Conscrypt upstream master. am: c75c928c22 am: bbbc8f539fPete Bentley
2021-07-22Merge Conscrypt upstream master. am: c75c928c22Pete Bentley
2021-07-20Merge Conscrypt upstream master.Pete Bentley
2021-07-15Test native null pointer checks in NativeCrypto by reflection. (#1024)Pete Bentley
2021-07-15Bump Java language level to 1.8. (#1025)Pete Bentley
2021-07-13Update development module version number to 319999900Adam Seaton
2021-07-12Allow stubs to be referenced from build/soong/java/core-libraries am: df7df8e...Paul Duffin
2021-07-12Allow stubs to be referenced from build/soong/java/core-libraries am: df7df8ebcePaul Duffin
2021-07-11Allow stubs to be referenced from build/soong/java/core-librariesandroid-s-beta-4android-s-beta-3android-s-beta-4Paul Duffin
2021-07-02[automerger skipped] Replace ART's core-platform-api stub with module-lib stu...Victor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubs am: c8c890711b am:...Victor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubs am: c8c890711bVictor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubsVictor Chang
2021-07-02Replace ART's core-platform-api stub with module-lib stubsVictor Chang
2021-06-25Merge "Update OWNERs file to use libcore/OWNERS" am: 0e1769f262 am: 90e87ef009Orion Hodson
2021-06-25Merge "Update OWNERs file to use libcore/OWNERS" am: 0e1769f262Orion Hodson
2021-06-25Merge "Update OWNERs file to use libcore/OWNERS"Orion Hodson
2021-06-24Create correct subclass of RSAPrivateKey from PKCS#8 key specs. (#1021)Pete Bentley
2021-06-22Merge "Merge Conscrypt upstream master." am: 383f874837 am: 963052e467Pete Bentley
2021-06-22Merge "Merge Conscrypt upstream master." am: 383f874837Pete Bentley
2021-06-22Merge "Merge Conscrypt upstream master."Pete Bentley
2021-06-18[automerger skipped] Merge "Include sdk versioning proto in conscrypt apex" a...Anton Hansson
2021-06-18Merge "Include sdk versioning proto in conscrypt apex" am: 159cb56f28Anton Hansson
2021-06-18Merge "Include sdk versioning proto in conscrypt apex"Anton Hansson
2021-06-18Update OWNERs file to use libcore/OWNERSOrion Hodson
2021-06-16Remove --skip-annotation-instance-methods=false metalava option am: 42b38bef7...Aurimas Liutikas
2021-06-16Remove --skip-annotation-instance-methods=false metalava option am: 42b38bef77Aurimas Liutikas
2021-06-14Include sdk versioning proto in conscrypt apexAnton Hansson