summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Josh Tsuji <tsuji@google.com> 2023-03-16 22:34:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-16 22:34:12 +0000
commit074828c6f9285476fe07a6e6dda6c3737506e50d (patch)
tree99dcd2f6b5bbdb454023abc057eff45c399d9371 /libs/androidfw/StringPool.cpp
parent6bb0d1c9ed7d9ef3bbc93944bec379974c915020 (diff)
parentb33fcbb84b43dc4e00285794b9b0136ccd76ac2f (diff)
Merge "Keep keyguard visible if we're launching an occluding activity over a going-away keyguard." into tm-qpr-dev am: b33fcbb84b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21090271 Change-Id: Ie19671291425a7e046c63efc67d2cfec8b711292 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