summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 10:45:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 10:45:20 +0000
commit2c715513721388a525b778e72bf408dbba083516 (patch)
tree9d6c999f9e01b3db54e66564d4b520d881adcabf /libs/androidfw/AssetsProvider.cpp
parent6767b1f018c7d90b713a64f092eca47777d6a922 (diff)
parent267af82f4e23ec2de9b464c0c741c105954bf020 (diff)
[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev am: 838fc349b6 am: 47f5ba9a3f -s ours am: f9f8cebc12 -s ours am: 7093cdc41e -s ours am: 267af82f4e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: I669fcb68da23efb61165757e48ce9e045df885f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions