Merge "Limit length and number of MIME types you can set am: 3ae3406b97 am: d47de97f03 am: bcd7713fad am: b160218b16 am: 57d99cca61 am: a370b4a47e" into udc-dev am: 502d72fc04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19785208 Change-Id: I30ad401f9c7efcf1d9fd9cd60b91f34326d0f8d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: