summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-07 17:40:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-07 17:40:26 +0000
commitcaffbdb3aec77a139cc8f740d2b05003c8213ccc (patch)
treea454d20629352112ea9d8d4ea4fd8e432ad24690 /libs/androidfw/StringPool.cpp
parent5191b7c85ba99d817411708ebfe5d8342c2f29dd (diff)
parent1a8ea86d1f219dcd7a35e8ed72793db1c8ef0928 (diff)
Merge changes from topic "am-e78dd5f36dfc4491b11bd1600b0dca17" into main
* changes: [automerger skipped] Merge "Bugfix: Allow shortcut and widget services to update shortcuts and widgets across all launchers during archival." into 24D1-dev am: e7a400e9f2 -s ours [automerger skipped] Bugfix: Allow shortcut and widget services to update shortcuts and widgets across all launchers during archival. am: 991a6dff14 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions