summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-08-20 23:45:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-20 23:45:34 +0000
commit6cf1b93aef0d590e8cd0cd48ef3b510698d7a745 (patch)
tree258dac1f0951e2a70c9bebca93e55b24502e104c /libs/androidfw/ResourceTimer.cpp
parentc2e0898a58cc00ca48234fcd14786a8a421bcca4 (diff)
parentd7d80d170a88c2e0e91a35f830279c4a08f34a15 (diff)
[automerger skipped] Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26bf9 am: 2ea5500310 am: 07a72155ec am: 682944b45f am: dda07ea9e4 am: 8ca5dd90bf am: 2adbfb4d1a -s ours am: d7d80d170a -s ours
am skip reason: Merged-In Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7 with SHA-1 f9d8d4945a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28021006 Change-Id: I63ed92ffbf6e2ae2899dc1ff468f47c1f97b685c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions