| commit | e6497d00673d9ebdd5832718a55fa83b7b16b558 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Dec 04 14:49:22 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 04 14:49:22 2024 +0000 |
| tree | 1057e1a9ad709f26ccd16c742d9dfe9017c57938 | |
| parent | b2dfd4b25af14b21b9573dfa9aa1bd667c76f33d [diff] | |
| parent | 88910740eadd4b8f01ef8cd24a54cc2e683c7a3e [diff] |
[automerger skipped] Merge "Fix compile error in different build variant" into main am: 2aeec5bd11 -s ours am: 88910740ea -s ours am skip reason: Merged-In I7195aaca849eb53e603565a470b780ba91b3ec2c with SHA-1 b4d900b118 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3386679 Change-Id: Ibc2fdd4d0f42fee4fad70552b3e7f5da3677a53b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>