summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-06-08 04:31:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-08 04:31:28 +0000
commit24bfa2729a0eae34c876affa353a5451c88ae2cf (patch)
treef214bc1cae5c3e5c0fdc6720256e405afe0d493f /libs/androidfw/StringPool.cpp
parent7864da39ce32f1b4d8a673510af66c4332d094ba (diff)
parent14256cb997185d35ed5198af9e9708e286a1a928 (diff)
[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into sc-v2-dev am: e49a9b66c7 -s ours am: 9ea0032969 -s ours am: 14256cb997 -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 b8c2d03b72 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027271 Change-Id: Ibc81e6b7ac07352ea35f069b122a375c4c1fb326 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