diff options
| author | 2024-09-09 14:21:02 +0000 | |
|---|---|---|
| committer | 2024-09-09 14:21:02 +0000 | |
| commit | 4721af4d875d9808bd3300dde86644c83b1ae13f (patch) | |
| tree | 1367eadfc158c66a06f87bca171d4132b52ef392 /libs/androidfw/ObbFile.cpp | |
| parent | 72ddf4ebc8df3e34c355927443f4cb55a63e639d (diff) | |
| parent | 1ec4cab140114e62cfdda753442e9c7ca8890a1c (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: 034e6dbe14 -s ours am: 0c26b2c239 -s ours am: 1ec4cab140 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181
Change-Id: I40c55e33d9f7276f6746ba6508093319f35939cb
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