1*60b67249SAndroid Build Coastguard Worker# Copyright 2021 Google LLC 2*60b67249SAndroid Build Coastguard Worker# 3*60b67249SAndroid Build Coastguard Worker# Licensed under the Apache License, Version 2.0 (the "License"); you may not 4*60b67249SAndroid Build Coastguard Worker# use this file except in compliance with the License. You may obtain a copy of 5*60b67249SAndroid Build Coastguard Worker# the License at 6*60b67249SAndroid Build Coastguard Worker# 7*60b67249SAndroid Build Coastguard Worker# https://www.apache.org/licenses/LICENSE-2.0 8*60b67249SAndroid Build Coastguard Worker# 9*60b67249SAndroid Build Coastguard Worker# Unless required by applicable law or agreed to in writing, software 10*60b67249SAndroid Build Coastguard Worker# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 11*60b67249SAndroid Build Coastguard Worker# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 12*60b67249SAndroid Build Coastguard Worker# License for the specific language governing permissions and limitations under 13*60b67249SAndroid Build Coastguard Worker# the License. 14*60b67249SAndroid Build Coastguard Worker 15*60b67249SAndroid Build Coastguard Worker# Fetches and merges upstream changes. Upload the resulting tree will produce a 16*60b67249SAndroid Build Coastguard Worker# single merge CL despite appearing as though there will be a CL for each 17*60b67249SAndroid Build Coastguard Worker# commit. 18*60b67249SAndroid Build Coastguard Worker 19*60b67249SAndroid Build Coastguard Workergit fetch aosp upstream-main 20*60b67249SAndroid Build Coastguard Workergit merge aosp/upstream-main 21