summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 09:52:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 09:52:44 +0000
commit5c91985775ad6d0dbb0393ba5d8c7de20712bf1f (patch)
tree9d6c999f9e01b3db54e66564d4b520d881adcabf /libs/androidfw/AssetsProvider.cpp
parenta224ebe5d0e0b9386641a55f8f430220008bddd9 (diff)
parent612a45c45743872e67b83f537ec068334e6f5d57 (diff)
[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-v2-dev am: 3c4757494e -s ours am: 612a45c457 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122582 Change-Id: I9c46192c54583a392c52588189838abff8c16b73 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