summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2024-01-08 12:50:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-08 12:50:57 +0000
commitb52340e20316f719c2f447e1f55f1bbb4a00fcb8 (patch)
tree74c4e0a354f5ab311f89c662a7c469aabb186169 /libs/androidfw/StringPool.cpp
parentc13279eca103742b882a1a57f3572a04e9b7240e (diff)
parentf07e3f28018a0aa7073789def23bd7975c098d89 (diff)
Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111cc4 am: f07e3f2801
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2897000 Change-Id: I7c552921bb58734ae4a8c71064d8c3db945c5446 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