summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-06-08 05:59:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-08 05:59:19 +0000
commitd3122bfe10830fbff6a208354fa00528f46ee741 (patch)
treefe820a890883b41d821e59f5e7db5c78a9a8b29e /libs/androidfw/FileStream.cpp
parenta8517e066ae6dc2088fec6dff955cb24c5b86386 (diff)
parent339b0bd16822fa072364b9ab9ce009794fcb71c2 (diff)
[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-qpr-dev am: 6ce832b646 -s ours am: 53b2ef023e -s ours am: 71f02e796a -s ours am: 31f54e3cb4 -s ours am: 782296ba35 -s ours am: e13f7e2d20 -s ours am: 339b0bd168 -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: I86fb40eaf6efd8fc690ec967f7311f0708dbbc53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions