tree bbf0820b62d3f9b704396f09317b699eca1977d2
parent e3e4f5325f3a9b46381531439b27dcfb294477fe
parent eb09069d46f12e23db42816a1147a2db073006e1
author Yifan Hong <elsk@google.com> 1655926465 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655926465 +0000

Merge tag 'upstream/1.2.1' into master am: 72f4997c35 am: eb09069d46

Original change: https://android-review.googlesource.com/c/platform/external/bazel-skylib/+/2132643

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