summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 10:20:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 10:20:03 +0000
commit68eacf71a82929ef9698aac0ba9aa66039d59c3b (patch)
tree2b1da5c9bd0342e0581524e4f174ebf598fd6e9d /libs/androidfw/AssetsProvider.cpp
parentc92526162f6cabc70e0cd3d04c9d080c0640bc50 (diff)
parentf9f8cebc127d1a63fb18efed7c7a6d72df30e6de (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: I8165508b903ea4bbdb330ff21c214aef3db84b1d 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