aboutsummaryrefslogtreecommitdiff
path: root/android_merge_from_upstream.sh
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-01 11:04:36 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-01 11:04:36 +0000
commit9870dd4e6d12bb96b4e78ca9fc6e8e5dbfa71d83 (patch)
tree77dc031614745bb406dbd90cea9a082a1b5cdd54 /android_merge_from_upstream.sh
parentf39a268cec0843ae14d6aa47feb49d32183cf1c5 (diff)
parentd44430951159ca340cd4c4e699917348f82abad8 (diff)
downloadtoolchain-utils-9870dd4e6d12bb96b4e78ca9fc6e8e5dbfa71d83.tar.gz
Snap for 9550355 from d44430951159ca340cd4c4e699917348f82abad8 to sdk-releaseplatform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4
Change-Id: I9ee07a3c89be79d32ad2cf53a87531e566b38107
Diffstat (limited to 'android_merge_from_upstream.sh')
-rwxr-xr-xandroid_merge_from_upstream.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_merge_from_upstream.sh b/android_merge_from_upstream.sh
index 4716a25a..a391979d 100755
--- a/android_merge_from_upstream.sh
+++ b/android_merge_from_upstream.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eu
-# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Copyright 2019 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#