summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Daniel Chapin <chapin@google.com> 2024-06-03 18:04:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-03 18:04:50 +0000
commit310661b92718a61ddbeb1feffa573c3b77f32c8f (patch)
tree2dd9bac9d63ff2b4e1c7465ba951c98092f0a037 /libs/androidfw/StringPool.cpp
parent3ee1b3cf321eedc3fa6b4c1bfbc55c745a0609eb (diff)
parente52858e5968900b62d4bd3ee04c15546675cb800 (diff)
[automerger skipped] Merge "Revert "Update face authenticating asset"" into 24D1-dev am: e52858e596 -s ours
am skip reason: Merged-In Ieab77cd8d500a79b25b2218dcb69a968d5a4e72d with SHA-1 026cf42563 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27366344 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27610922 Change-Id: Iaee243e1b4595e18f4c0a73278d428507981e89e 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