summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2023-07-26 07:01:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 07:01:26 +0000
commit1d6c954e96674b85feb029af5c80d95a830121dd (patch)
tree8f131ceeb5423b26e8c87e7892c87d36affc880b /libs/androidfw/AssetManager2.cpp
parent4625943b0e6d1bc339c18ea9f44dc0fc702f13ac (diff)
parentdde0e76639e2f3d9c695209e3ac3b1aedb17fca5 (diff)
[automerger skipped] Merge "Add preinstalled partition to seinfo" into main am: 5c4b87083d am: dde0e76639 -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: Ide66c12e58904df025013dcc48264bba35f0d9a7 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