tree 47e7d7861b4e9898ff15c3c596f730ba500ec51a
parent 9a0e0e03e16d54fbc481d62f3bbb86101ac32da1
parent f31df6234091b5b1de258a01dd4b2d8e5415ee2e
author András Kurucz <kurucz@google.com> 1683208843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683208843 +0000

[automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536

Change-Id: I4021e366bb0f12ba28b8dd1d9ae13c6d71976bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>