tree 27002ec6f0ba068563faff1dfdf3924c43162a37
parent d7c2d8075d0d8bf8bc8d041c08b5c7290f9a8d7c
parent f6ee38ede7ce30d0dbda7235e42b124e97da9db5
author Aurimas Liutikas <aurimas@google.com> 1685478063 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1685478063 +0000

Merge "Revert "add some core filter types"" into androidx-main am: f6ee38ede7

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2609152

Change-Id: Id7f8fed8865d4bea0b57df3e6900de8f196d9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>