tree f7303b378ad1751f91f80bf04f07e65792b4651a
parent c3ea2f9ed92eb26ec91d6ef22daf2d064c9fd53c
parent f4eaf090f562d6af65ada9fb93ff52b781e64f2f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699994819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699994819 +0000

Merge "Merge "[aapt2] Implement FeatureFlagsFilter" into main am: 3fc4d3967e am: 14e2faed4a" into udc-qpr-dev-plus-aosp am: f4eaf090f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2818004

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