summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 11:54:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 11:54:15 +0000
commit954306c0c97c8e6d75aa4254bebc830af68e0cfe (patch)
tree109d7c69ce73d6dae887d18eb312592f2163128a /libs/androidfw/AssetsProvider.cpp
parent53a62b0e60ca979b83d6eb2d2085daeaa9b42951 (diff)
parente1c30ade84cdea8b719ef59caab5aec81914738a (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: e1c30ade84 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: Ifa6808288632a52bdbcf701ac178d2b366f319e1 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