[ANDROID] Add script to merge upstream
Bug: 187673309
Test: ./merge_upstream.sh
Change-Id: I3ab9dade8ee9b099c173adc291c72648f0176a84
diff --git a/merge_upstream.sh b/merge_upstream.sh
new file mode 100755
index 0000000..ffe1b92
--- /dev/null
+++ b/merge_upstream.sh
@@ -0,0 +1,20 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# Fetches and merges upstream changes. Upload the resulting tree will produce a
+# single merge CL despite appearing as though there will be a CL for each
+# commit.
+
+git fetch aosp upstream-main
+git merge aosp/upstream-main
