diff options
| author | George Burgess IV <gbiv@google.com> | 2021-05-18 00:57:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-18 00:57:58 +0000 |
| commit | ceeed33555d2a838543c05e0bb5f5a9bccea14f1 (patch) | |
| tree | 188624ded1b42225df1f00421d18f7018f6df207 | |
| parent | b5a28deea25cee7d3e5caaea4f08d85b6038f76a (diff) | |
| parent | b19815824d91b808cd18f109f0da08c000900a29 (diff) | |
| download | toolchain-utils-android-s-beta-5.tar.gz | |
android_merge_from_upstream: update to point to new branch am: b19815824dandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1709531
Change-Id: I0532e43b1ca3299209e6d4ea3dd51c41e2c56c4c
| -rwxr-xr-x | android_merge_from_upstream.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_merge_from_upstream.sh b/android_merge_from_upstream.sh index b63eb6e1..65b47d7b 100755 --- a/android_merge_from_upstream.sh +++ b/android_merge_from_upstream.sh @@ -13,7 +13,7 @@ local_branch_name="merge_with_upstream" local_upstream="aosp/master" remote="aosp" -remote_branch="${remote}/upstream-mirror-master" +remote_branch="${remote}/upstream-main" my_dir="$(dirname "$(readlink -m "$0")")" cd "${my_dir}" |