summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2021-11-01 20:54:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-01 20:54:56 +0000
commit096a5c5a8e4878666d4eb0c2098cdfffe4a04626 (patch)
tree608727eca210ca353eeb26f8147a50fb0e2453f3 /tools/aapt2/ResourceTable.cpp
parent62c0e2020e24dfc00603bcb9da4f0d2cfc0b9f74 (diff)
parentfdf6eedb1056242d657c598dc3a2bccfc12b8246 (diff)
Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev am: fdf6eedb10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150706 Change-Id: Ieaaa85134e0f31cc322d63d4974aee8e3596ec6e
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions