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

Merge "Fix framworks/base compiling against musl" am: 2cba49ac56 am: d5b3d74850 am: 1559860d81 am: 4ebc6b077f

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

Change-Id: Idee24ad18e175e6806aa933e8ec9f57ec87fba4a