summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-18 17:40:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 17:40:46 +0000
commit535da070b1df1df7f9e752790e8adeac02a023b1 (patch)
treedf8afd0a73ace9baaac86438e7c684663a5dc59b /libs/androidfw/AssetManager.cpp
parent9995aefe19e837f3680e7f2b3459ee6113de8dc8 (diff)
parent85d58379e96e378a60e4915479042a64b8cb1bfa (diff)
[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 9ba8706bbf am: ddf7338570 am: 1624ad4632 am: 546041c4b0 am: 85d58379e9 -s ours
am skip reason: Merged-In I605c6c25c2415bdb4996715f270ee8be9e9d1a23 with SHA-1 3f9f863ea0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715835 Change-Id: Ibe7a862d62f736c4be0665adaaa8a81ec4a2d4af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions