summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-07 14:44:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 14:44:13 +0000
commit5897b86048ddf201d2029fa6c39e5ebc29ec0616 (patch)
treea13dffa050e581d76f877f34f89113bbb32c0a89 /libs/androidfw/StringPool.cpp
parent8cd15a3fc99fdae44f251981cba83c90a3673f62 (diff)
parentb064ace3e9cfe2cf97e9c3ff0cd99beb1f006e6e (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: d76f26495c -s ours am: 9b5664c305 -s ours am: b064ace3e9 -s ours
am skip reason: skipped by user juliacr Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I27b3354a89a49832815141189278f80b6bc6873c 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