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