[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into qt-dev am: 380ec03dee am: e5fdd7f0de -s ours am: ae6b8569a3 -s ours am: 36de09dab8 -s ours am: 6f0bda9117 -s ours am: 1c05308857 -s ours am: 349cfc899a -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 1fcd99f5aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794
Change-Id: I87a6048cb1c457ed80be0b71b6c8f04f24a289bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: