diff options
| author | 2024-09-09 13:59:28 +0000 | |
|---|---|---|
| committer | 2024-09-09 13:59:28 +0000 | |
| commit | a66af36f43dde1dea1c1e8b44dd932286596db99 (patch) | |
| tree | f919fbaf30e216a42f0c8a0543b8f2922a892c3a /libs/androidfw/AttributeResolution.cpp | |
| parent | 70af9db01635344744de646cbd53e03e555b91e8 (diff) | |
| parent | a44cb6784808959b827e79f2c92ce5d41bd7a0ed (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev am: 40656631c5 am: 3be0af36be -s ours am: 9e1c27f1d2 -s ours am: 289786cdf9 -s ours am: 021278f83a -s ours am: ca6185ae82 -s ours am: a44cb67848 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181
Change-Id: Ifd0fad7f84236527cff9f11ea51da57d1ef086ca
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