summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-07-01 12:19:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-01 12:19:44 +0000
commit53783e6fe56c7870974e7b34cd8f0a37527f78a5 (patch)
tree9640abab1cad952865379c212d12ba92ea594bbf /libs/androidfw/AssetsProvider.cpp
parent50f5854827871a7f3927eb8bd15068db1f39e9c7 (diff)
parent8d8db240f0c7eb3e75362852a927ba1fcac603af (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: d24010b916 -s ours am: 8d8db240f0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029146 Change-Id: Ib5f00f7cd47931d7b621928c1d4941c4f1dc1afb 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