tree 39314478665e3c080e3df6fe4a97609182f089b5
parent 31f9c7d4079448d6c2aec0b3e89ecbd25def99cf
parent ffc082fc7b3bc779251846c063bd127b941a3d52
author Jingwen Chen <jingwen@google.com> 1679733097 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1679733097 +0000

Merge remote-tracking branch 'aosp/upstream-main' into mymerge am: 748e62d604 am: dad1665d12 am: eb146bbc49 am: 0f22c081a0 am: ffc082fc7b

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

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