tree d9fac15bb5a835ae6ba757dc5eaf6ef597ea44cf
parent 9803cf8403d7105bddc1d5304d6e694b781a6605
parent 780ccd3956961690db3e36d8fa1ed7649cb0057b
author Spandan Das <spandandas@google.com> 1686796250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686796250 +0000

Merge remote-tracking branch 'aosp/upstream-master' into merge_rules_go am: 49dcd02124 am: 711a453236 am: 6cf433ad1b am: de80525bba am: 96939a977e am: 780ccd3956

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_go/+/2625353

Change-Id: Id4ca3195d832eca77b29b2896b89027d847bb72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>