summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-08-20 23:26:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-20 23:26:52 +0000
commitad363fa88cb453ec23b0a9fe67e5515c49b773ce (patch)
tree0e0958f162196be865f14e5a12a565b21b8c60ce /libs/androidfw/ApkParsing.cpp
parentb06d43b9b993dd0d8c0a230feef06c9bf45c01f9 (diff)
parenta989f13978e1fbe00440e728f133e5965fc55fe8 (diff)
[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26bf9 am: 2ea5500310 am: 07a72155ec am: 682944b45f am: 55a72076dd am: a1b392e6e5 -s ours am: a989f13978 -s ours
am skip reason: Merged-In Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7 with SHA-1 a3d258ea3b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28021006 Change-Id: I4150cebe9f9d116f96f9c2a3ed070f5a210a414f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions