[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: 9f6e9f9f96 -s ours am: 4e12bdc3cd -s ours am: 02e7e4a385 -s ours am: ac4bb89aaa -s ours am: 366784f256 -s ours am: 4f0dcf7302 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225 Change-Id: I57a750685d8a5d65b2f46d8c88fb3fd418c6c071 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: