summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2023-06-08 05:56:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-08 05:56:27 +0000
commit4988fff2389db13335b510d611bf3f1f475b9caa (patch)
treed4e545a09e1759919cae3ea5f56b42f7982974e7 /libs/androidfw/FileStream.cpp
parenteb20498ff31915682c73037671eed6f982dbe0fc (diff)
parent7c8077299c1063a4035813f1723699bf29caee83 (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 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: I161afdf8c1f70262ec865f44cb7ed98bc2d56ccf 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