Merge "[automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: d0e942d756 -s ours am: 11f6e05c0b -s ours am: 5b5384cbaa -s ours" into tm-d1-dev-plus-aosp am: 0a2018cacc -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126
Change-Id: Ie6d077257cdd582a53ead97412a7db32a6dd1669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: