commit | 1d8ff858d65d27e92e7fce648e863ded1e45ba89 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Fri Sep 17 02:15:45 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 17 02:15:45 2021 +0000 |
tree | e1d799bd68b7bc6de4c3176aacf013ead3660993 | |
parent | 1559860d814f150c85184fca0b584ca518883daa [diff] | |
parent | b0272195f6eae2c4380ded24d8f3ee120fcfc8c7 [diff] |
[automerger skipped] Merge "Fix idmap2 compiling against musl" am: 3ba8a37ee5 -s ours am: b0272195f6 -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: I506883a7a756bfdfe86da42eef9bd427b104348e