commit | c73f4cd173cc667f8406b53a40ec656afed7a49a | [log] [tgz] |
---|---|---|
author | Ben Murdoch <benm@google.com> | Mon Sep 09 14:28:01 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 09 14:28:01 2024 +0000 |
tree | 1367eadfc158c66a06f87bca171d4132b52ef392 | |
parent | b7e3ee5bd11769bb7846b12ffacf87a49dac11e3 [diff] | |
parent | 52a1bfa5a3c36c73fb46358f3260bc56754d37bb [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: 1d3247bf4c -s ours am: 52a1bfa5a3 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181 Change-Id: I3c69b87473586a4195755475d945345c40ead4f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>