summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author John Wu <topjohnwu@google.com> 2024-09-27 01:29:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-27 01:29:38 +0000
commit92b85da3b16cc65d9ebfc6bc165b370948ed71ea (patch)
tree44cdb97ab91260fa7c66b10c046a9085aa459bdf /libs/androidfw/AssetsProvider.cpp
parent31ac47bd9fcb0a37e3d4ab48088af439454112a3 (diff)
parentdef5b9f46ab6212ebcbcafc1bf7246aa166aa8cb (diff)
[automerger skipped] Cherry-pick Ravenwood "core" code am: 983461633b am: def5b9f46a -s ours
am skip reason: Merged-In I8a9b8374be3ae052ba4f152eb43af20d0871597f with SHA-1 43ad4a4682 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3279958 Change-Id: I1bd435748a185456380c2295f9c16a810364a7b5 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