diff options
| author | 2024-09-11 18:49:40 +0000 | |
|---|---|---|
| committer | 2024-09-11 18:49:40 +0000 | |
| commit | 43e011dd06dda962266cedafec57a759b4db59d9 (patch) | |
| tree | 7a0de87fc9dbc2b252de0678f07624256cd97587 /libs/androidfw/ObbFile.cpp | |
| parent | f461ccf9efa576e41d11bdd7cbbd2f001887b82e (diff) | |
| parent | c4af475c1a03d8d6c25d10517898f2d940bfef47 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev am: 43dc334dcf am: 3f0fc1f2b6 -s ours am: ff85060e4a -s ours am: c4af475c1a -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29073445
Change-Id: Idb83df21f8f2101882d0b094d768746b987bee12
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