summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2022-05-12 17:45:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-12 17:45:03 +0000
commit92b65722f89891fdd82b53478c3631a07d6d54c7 (patch)
treea7b7f8976a0bd4639e2f0990c836a35882fbd164 /libs/androidfw/StringPool.cpp
parenta73217ec1507278f6b3a7f56c90665b34ee6daf2 (diff)
parent6a69a2c8449cd6d1ca5baa6c0956b4086f9c50ee (diff)
Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c844
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186409 Change-Id: I0ebd58370be598bc2b17f0d634604ec5b582f1a2 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