tree 096454abf50a73063ca997f864b3d5f3255a5899
parent 2f5adc3e76cbe5c14d334e69c440b14025663f75
parent d843abb77040fb9e18ad2e85756261e5eb392d6c
author Xin Li <delphij@google.com> 1633679832 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679832 +0000

[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a -s ours am: d843abb770 -s ours

am skip reason: Merged-In I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1847596

Change-Id: I33eeff07f0dbedf8997dbb38dbf236564eab47a8