summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 12:49:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 12:49:08 +0000
commitd5f94dbd291b2e3e9fad05f90ba8026831bdf00e (patch)
tree2f5d4b50e34e2b7b188442e1b894f81260b6216f /libs/androidfw/AssetsProvider.cpp
parent7fe6b1b202c2d7f2ae4630961ba588669fc058fd (diff)
parent53783e6fe56c7870974e7b34cd8f0a37527f78a5 (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: 68eacf71a8 -s ours am: fcdeff8235 -s ours am: cc408745e6 -s ours am: d24010b916 -s ours am: 8d8db240f0 -s ours am: 53783e6fe5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: I5961d97af9b8dfc9d782db21dd0667f8a3b7e5aa 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