diff options
| author | 2024-12-04 14:15:54 +0000 | |
|---|---|---|
| committer | 2024-12-04 14:15:54 +0000 | |
| commit | 88910740eadd4b8f01ef8cd24a54cc2e683c7a3e (patch) | |
| tree | 17717bdd20ef326c7f110156fe89c1657c195c0e /libs/androidfw/AssetManager.cpp | |
| parent | 6d3ff4c4ebde1724530881a225e8bf1fac5b3e44 (diff) | |
| parent | 2aeec5bd112e60981905a3a9a29a1df0e709e8ff (diff) | |
[automerger skipped] Merge "Fix compile error in different build variant" into main am: 2aeec5bd11 -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: If10f13f4621486d89a6309320e9e2ff1c1a29851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions