[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev am: 94f3527c81 -s ours am: ba518abf4f -s ours am: 7276f8124e -s ours am: 97700a0481 -s ours am: c4c13f6ae6 -s ours am: 411a8b6723 -s ours am: 7e4e9721d4 -s ours am: 59e788733f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23818592 Change-Id: Iddbf63191257b31eb531548e87c000c691741005 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: