[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: 4f82e972a8 -s ours am: f7bde983ae -s ours am: 36c68fe85d -s ours am: 3949f240b9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23818592 Change-Id: Ie6ba77051cf8f22627ba5cfd1190bfea7c997592 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: