summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Anna Bauza <annabauza@google.com> 2024-04-23 12:34:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-23 12:34:31 +0000
commit89c7cc5397b71605d8ca0f102f251aaa6dd8be4f (patch)
treea73e40c3ed55f445bd31f51aac3224d5b7efad22 /libs/androidfw/StringPool.cpp
parentbded2b5e21cff7251c3844b29737d07054596632 (diff)
parent8cb9033ee7eda895f6358f5e375d6076a910927e (diff)
[automerger skipped] Merge "Adding avatar picker to platform allow list" into main am: 487165c647 am: 8cb9033ee7 -s ours
am skip reason: Merged-In I096d28bce5f879f88f185f09014d139f0497cb72 with SHA-1 f1d32bc12d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3052022 Change-Id: Ibd8670429f24e0d144f3edf9c5d8a8668ab2bebb 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