summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-06-17 20:41:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-17 20:41:39 +0000
commit04cbc8cc72fc1ca89fecbe019e7be9b168762ad6 (patch)
treef8a8cbe2810fecdf6bf93fb22b88c946d56efb9b /libs/androidfw/AssetsProvider.cpp
parent29aa74750f41fbdd56e9ceefdd72bf3de17a1d67 (diff)
parentc33d8a06dd84bd1c4e2f65aa8fc2577dbecb3f86 (diff)
Merge "Merge Android 14 QPR3 to AOSP main" into main am: c33d8a06dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3131921 Change-Id: I9529bec258f0a1148c81572fa159121e2f474765 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