summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2022-12-12 15:30:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-12-12 15:30:45 +0000
commitf32b0f1c9db535ddd654fa6492fee8becdc08382 (patch)
treef41fc328543bac18b34b03efe34a9f47d9fbf565 /libs/androidfw/StringPool.cpp
parent6ad0de2eae364c54d9814e85ff12df32ae02d919 (diff)
parentb738edddb7fb410e0b60856e5f00d156d09d1913 (diff)
Merge changes from topic "revert-20691780-cherrypick-modernize_alt_bouncer-2av1xvqe7q-EXOZAWOBTI"
* changes: Revert "Modernize alternate bouncer logic" Revert "Remove ScrimController from BiometricUnlockController"
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions