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