[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 am: f552951850 -s ours am: c03b0e2d78 -s ours am: 2469175173 -s ours am: 6ed8957551 -s ours am: 1099409625 -s ours am: 0bbb0e7c4f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227 Change-Id: If825e13981595921c5dadaea59fdf157beffd4e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: