aboutsummaryrefslogtreecommitdiff
path: root/android_merge_from_upstream.sh
AgeCommit message (Expand)Author
2022-01-05Merging 32 commit(s) from Chromium's toolchain-utilsandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Stephen Hines
2021-10-28Replace non-inclusive languageJordan R Abrahams
2021-05-17android_merge_from_upstream: update to point to new branchandroid-s-beta-2android-s-beta-1George Burgess IV
2020-06-24android_merge_from_upstream: fix up namingGeorge Burgess IV
2019-10-04Add a merge-with-upstream script to toolchain-utilsGeorge Burgess IV