diff options
| author | 2023-06-08 09:58:25 +0000 | |
|---|---|---|
| committer | 2023-06-08 09:58:25 +0000 | |
| commit | 49fbd85596f6cf723072c383290848e3737406ac (patch) | |
| tree | 11899af91fc7426eae7c15b8156ff715ac84a383 /libs/androidfw/ObbFile.cpp | |
| parent | 3bfc9af1d9684297700fe310baa1e11ada8bee2c (diff) | |
| parent | 170fce36711def81605541230b29f43b98e4f25a (diff) | |
[automerger skipped] Merge "RingtoneManager: verify default ringtone is audio" into rvc-dev am: 0e3093b230 -s ours am: a810c47bb9 -s ours am: 964e3b6230 -s ours am: 2cc01d2535 -s ours am: 89d00273df -s ours am: 07a20cf671 -s ours am: b9c33f99b5 -s ours am: d73ad15bf9 -s ours am: 522646d7ee -s ours am: 170fce3671 -s ours
am skip reason: Merged-In I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e with SHA-1 ae2819716e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21027192
Change-Id: Iee08c2c13c70138578ec31cdbf8c2017019115c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions