diff options
| author | 2024-09-09 14:22:13 +0000 | |
|---|---|---|
| committer | 2024-09-09 14:22:13 +0000 | |
| commit | e6460e43c9b24b603f57dbcef1d1932e38446e73 (patch) | |
| tree | 1367eadfc158c66a06f87bca171d4132b52ef392 /libs/androidfw/ObbFile.cpp | |
| parent | d2b13304274e2b1afc74e60ef18ff216d82867cf (diff) | |
| parent | a66af36f43dde1dea1c1e8b44dd932286596db99 (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: a66af36f43 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181
Change-Id: I74a547105260da07c83bd6a3606db54ed89fd348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions