diff options
| author | George Burgess IV <gbiv@google.com> | 2021-05-17 10:36:02 -0700 |
|---|---|---|
| committer | George Burgess IV <gbiv@google.com> | 2021-05-17 10:39:45 -0700 |
| commit | b19815824d91b808cd18f109f0da08c000900a29 (patch) | |
| tree | 188624ded1b42225df1f00421d18f7018f6df207 /android_merge_from_upstream.sh | |
| parent | dcf506b0845964e11653c971c736fa3e7142db02 (diff) | |
| download | toolchain-utils-b19815824d91b808cd18f109f0da08c000900a29.tar.gz | |
android_merge_from_upstream: update to point to new branchandroid-s-beta-2android-s-beta-1
Bug: 188246907
Test: Ran to generate a merge commit.
Change-Id: I0e5262c53e52babdc61bbabcf23652bdb9621608
Diffstat (limited to 'android_merge_from_upstream.sh')
| -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}" |