summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Mark White <anothermark@google.com> 2023-08-31 10:45:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 10:45:40 +0000
commit6a624d8ce7eea149eed408d3c5d67e808070689c (patch)
treec855fd54a3b45a6a744a6131bd2e603dc6813bdd /libs/androidfw/AssetManager2.cpp
parenta3ac954dea418635d2458533c95f2b07b3cc6e7a (diff)
parentce312cfcc09bd85154b216d3d01ef61f7952969e (diff)
Merge "Created empty framework-location non-updatable module" into main am: 22f1191130 am: ce312cfcc0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2729073 Change-Id: I60f8bf6da982bad7782945d9c50f8adf52b76c08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions