summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2023-07-26 09:09:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 09:09:00 +0000
commit7d6d2fa4af2a69cb86410490a7fcb9ee2ae00bea (patch)
tree8f95a67dac85168b5c3eb5627665b1a484aa96b9 /libs/androidfw/AssetManager2.cpp
parent38f259430cdce785b8c6cf50567cacc4f4525a93 (diff)
parent8cc7271da93c6564a3d6716bbadf5483ec41b0ee (diff)
[automerger skipped] Merge "Add preinstalled partition to seinfo" into main am: 5c4b87083d am: dde0e76639 -s ours am: 1d6c954e96 -s ours am: 8cc7271da9 -s ours
am skip reason: Merged-In I0b407ad8b95278453d5b917e0da7024b245062b9 with SHA-1 d2f1a64991 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670836 Change-Id: I0223a9b4215eba9391bc18d134d1eee7d66233f6 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