Merge "Allow passing in a category override to aapt2" am: 8fbb26bf94 am: d6c031cce4 am: 3e8a3d4f9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2242347 Change-Id: I68791104c90887bf59200920efb10510d58db63c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: