summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 10:19:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 10:19:24 +0000
commit4a5df0c0be2e0455584f500a9f07e1fd0e921669 (patch)
tree4222ffc677e267d6c97ce4936a17dcec78e085d1 /libs/androidfw/AssetsProvider.cpp
parentc087c9a55dd56737e3d5e87c7ff93f5e3c4bd7e4 (diff)
parent3c8562a76b395f8475b825bbb4a17173fac80f8f (diff)
[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f20 am: be5aef034e -s ours am: 3c8562a76b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029563 Change-Id: I03c3b6ffa3aef6f3fa498c0dc51e1c5746a579c6 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