summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-15[conflict] Remove skia dependencies from manifest am: 640da92decstudio-mainJens Ole Lauridsen
2024-03-14Remove skia dependencies from manifestmirror-goog-studio-main-without-vendorJens Ole Lauridsen
2024-03-14[automerger skipped] Revert "Update Skia" am: f0fe13ebac -s oursJens Ole Lauridsen
2024-03-12Fix merge conflict after reverting skia changeJens Ole Lauridsen
2024-03-11Fix merge errorJens Ole Lauridsen
2024-03-11[automerger skipped] Update Skia am: 8cb10f2c42 -s oursJens Ole Lauridsen
2024-03-08Fix merge conflict on mirror-goog-studio-main-without-vendorJens Ole Lauridsen
2024-03-07Revert "Update Skia"Jens Ole Lauridsen
2024-03-06Update SkiaJens Ole Lauridsen
2024-01-13Update dexter to commit: 861a1b26fc155344d9746afec6f8b6cf4ea3e2d8 am: 9eaf6926f0Jens Ole Lauridsen
2024-01-12Update dexter to commit: 861a1b26fc155344d9746afec6f8b6cf4ea3e2d8Jens Ole Lauridsen
2023-12-04[conflict] Add external/python/absl-py am: aa4ecf7c7aTom Renn
2023-11-17Add external/python/absl-pyTom Renn
2023-10-05[conflict] Use zlib from master am: 70d8e5ec66Joe Baker-Malone
2023-10-04Use zlib from masterJoe Baker-Malone
2023-08-04Update SkiaChris Warrington
2023-08-02Revert "Update studio-main after Android Studio Giraffe."Saurabh Chaudhary
2023-07-26Update studio-main after Android Studio Giraffe.Xin Li
2023-07-05DO NOT MERGE ANYWHERE - Update studio-main to use main branch.Xin Li
2023-07-05[automerger skipped] DO NOT MERGE ANYWHERE - Update studio-main-without-vendo...Xin Li
2023-07-04DO NOT MERGE ANYWHERE - Update studio-main-without-vendor to use main branch.Xin Li
2023-06-01[automerger skipped] Merge "DO NOT MERGE ANYWHERE - Update studio-main-withou...Xin Li
2023-06-01[automerger skipped] DO NOT MERGE ANYWHERE - Update studio-main-without-vendo...Xin Li
2023-06-01Merge "DO NOT MERGE ANYWHERE - Update studio-main-without-vendor to sharded s...Xin Li
2023-05-26[automerger skipped] DO NOT MERGE ANYWHERE - Update studio-main-without-vendo...Xin Li
2023-05-26DO NOT MERGE ANYWHERE - Update studio-main-without-vendor to sharded superpro...Xin Li
2023-05-24DO NOT MERGE ANYWHERE - Update studio-main-without-vendor to sharded superpro...Xin Li
2023-05-17[conflict] Update superproject tag to point to the correct superproject revis...Brian Egizi
2023-05-17Update superproject tag to point to the correct superproject revisionBrian Egizi
2023-04-24[automerger skipped] Pull skia from udc-release am: 3f40eda964 -s oursJens Ole Lauridsen
2023-04-07[automerger skipped] Update skia dependencies am: 5ae373270b -s oursJens Ole Lauridsen
2023-04-07[automerger skipped] Revert "Update skia dependencies" am: 7dbcb6a9f5 -s oursJens Ole Lauridsen
2023-04-06[automerger skipped] Update skia dependencies am: 5985f7858b -s oursJens Ole Lauridsen
2023-03-30Pull skia from udc-releaseJens Ole Lauridsen
2023-03-21Update skia dependenciesJens Ole Lauridsen
2023-03-20Revert "Update skia dependencies"Jens Ole Lauridsen
2023-03-16Update skia dependenciesJens Ole Lauridsen
2023-03-08Add missing revision to superproject tag in manifestBrian Egizi
2023-02-06Link toplevel.bazelrc, toplevel.bazelversion am: ff2185b4c2Tom Renn
2023-01-26Link toplevel.bazelrc, toplevel.bazelversionTom Renn
2023-01-13Merge remote-tracking branch 'origin/mirror-goog-studio-main-without-vendor' ...Chris Warrington
2023-01-12Manifest for Android Studio Electric EelThe Android Open Source Project
2022-11-07Add platform/external/jarjar to studio-main-without-vendorEugene Yakavets
2022-09-15Manifest for Android Studio 2021.3.1 (9014738)The Android Open Source Project
2022-03-04Make studio-main-without-vendor represent AOSPChris Warrington
2022-02-18Update frameworks/layoutlib revisionJerome Gaillard
2022-02-17Add Kotlin projectsDana Dahlstrom
2022-02-08Update frameworks/layoutlib revisionJerome Gaillard
2022-01-21Manifest for Android Studio 2021.1.1 (8092744)The Android Open Source Project
2021-12-15Merge "Update frameworks/layoutlib revision" into studio-mainJerome Gaillard
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 12:52:35 +0000