summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2023-06-08 06:40:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-08 06:40:38 +0000
commit5e54066985c9eba871a8d9f11346c3d8a5c0a8b9 (patch)
tree56a88e7f8830c185a1111ae86b1b17759ae6ab53 /libs/androidfw/ZipFileRO.cpp
parentfb966744e4715b1dc972fe21a85c2b28720f67d5 (diff)
parenta8517e066ae6dc2088fec6dff955cb24c5b86386 (diff)
[automerger skipped] RingtoneManager: verify default ringtone is audio am: ae2819716e -s ours am: 5f7f51890f -s ours am: 3273766174 -s ours am: 580b8a3c27 -s ours am: 515faddc76 -s ours am: 7c8077299c -s ours am: 4988fff238 -s ours am: a8517e066a -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 a67982c990 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027348 Change-Id: I63b0e10283fc569b1b925aba2755efd0739ccbc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions