[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev am: 94f3527c81 -s ours am: ba518abf4f -s ours am: 8dcec5292a -s ours am: 73cb2d52eb -s ours am: 385f421db4 -s ours am: 7b0d999091 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23818592 Change-Id: Idd30364735797feac2024dfe64081f8c1be6a274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: