summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Daniel Akinola <dakinola@google.com> 2024-05-29 20:34:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-29 20:34:55 +0000
commit4bdd9afd6c34e8e8060a4dcd447d34c68bd15517 (patch)
tree5de2f54b9a5b721ed0d6e4c491d5b0f9c5838166 /libs/androidfw/StringPool.cpp
parent353d146b8255aa17eee1827c7bc0ce7206491719 (diff)
parent801803c1132d3c26220f27006e9ca969124208e4 (diff)
[automerger skipped] Merge "Revert "Allow recent apps to be launched with split screen pair ..."" into 24D1-dev am: 801803c113 -s ours
am skip reason: Merged-In Iff49ff89ea2367187f8ba34bad6730a1bb6f3738 with SHA-1 558bf873fa is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27579796 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27575186 Change-Id: I64d408e96d340652f328872010e9061050709e70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions