diff options
| author | 2024-05-15 16:13:05 +0000 | |
|---|---|---|
| committer | 2024-05-15 16:13:05 +0000 | |
| commit | c2644b786edf1e086df7a3170935ea4a0cbd9ea1 (patch) | |
| tree | 2e9bdfcc58e5823f1116e505320a3fbd1800c890 /libs/androidfw/AttributeResolution.cpp | |
| parent | bada7b4a2ecb698a136631b262992a0d2daba4f8 (diff) | |
| parent | 29d6d7ee8381f4f5f59fbd057d3e704995770813 (diff) | |
Merge "Do not overwrite user set or live wallpapers" into main am: 3ff587dd76 am: 29d6d7ee83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347163
Change-Id: I3e8a6ab45c3a697596a1e9a74fba526a5fae6680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions