summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-29 19:04:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-29 19:04:49 +0000
commitd128659f9750d1a9d9cc81312f151a975696f406 (patch)
tree381a8af54578b29429e10e136fa602e72ef3d461 /libs/androidfw/StringPool.cpp
parent2e17eeb60e47005343a55bfa1e53c56cfd778108 (diff)
parent5337f3c29362d6a0f41deef049db330d00a22f66 (diff)
Merge changes from topic "am-7b77bee8056447ccae1f383eb315d4f3" into main
* changes: [automerger skipped] Merge "Allow recent apps to be launched with split screen pair from MediaProjectionAppSelector" into 24D1-dev am: 1efba88d3d -s ours [automerger skipped] Allow recent apps to be launched with split screen pair from MediaProjectionAppSelector am: 389bf56b54 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions