[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours am: 725961fbbf -s ours am: d0836243e3 -s ours am: 98210db275 -s ours am: 4e7d4c2c29 -s ours am: 9814416d5d -s ours am: e17f8ea00f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225 Change-Id: If7eed6f3bfa0904e9203f7ce0079df1855c1c5b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: