tree f55ed316ed8efe70b58262ec5ae2d81db0533dc4
parent 4ebc6b077fcf000ee2b127e6d8108c2a775709c3
parent 1d8ff858d65d27e92e7fce648e863ded1e45ba89
author Colin Cross <ccross@android.com> 1631845824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631845824 +0000

[automerger skipped] Merge "Fix idmap2 compiling against musl" am: 3ba8a37ee5 -s ours am: b0272195f6 -s ours am: 1d8ff858d6 -s ours

am skip reason: Merged-In If8829cebb0c62b539d7a336b75cf106755588cdd with SHA-1 9192abcf13 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826576

Change-Id: Icb9bcabf7feb8eebd2fe48f962849bca3e454ad8