tree 852e73e45af48623c78a152bdd5dc38f8a4986ab
parent d63e6ef3556970fa86082fca81b1d3417240cadf
parent 219e8b42b9065a0655c3c2d677949059a1845ce8
author Alex Humesky <ahumesky@google.com> 1638355145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638355145 +0000

Merge remote-tracking branch 'aosp/upstream-pre-alpha' into update-rules_android am: 219e8b42b9

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

Change-Id: I62b988b1dc694fa6bc5fa6040b792bc34dc8dc77