summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 10:55:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 10:55:34 +0000
commit91c1871c5bc9d45ea15d015a961e64c7b9835d80 (patch)
tree109d7c69ce73d6dae887d18eb312592f2163128a /libs/androidfw/AssetsProvider.cpp
parent68be959c631e168deb7fccd5ab03c19af80d2ccd (diff)
parent43961267cbb3c8fcc3cbb31d2eb28b03d8c45e1f (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: 7093cdc41e -s ours am: 267af82f4e -s ours am: 43961267cb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: I099e3382e5d392bd9c1ef111c1d1faf67a748cd2 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