summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2025-03-06 07:16:12 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-06 07:16:12 -0800
commit96d61d174c349f45adf1a32e6346d64aaf686182 (patch)
tree0dbb6d4f20f0837a70227b5a37d1195a38f9ab8c /libs/androidfw/ResourceTimer.cpp
parentefc9ce9dcbd3dd01fb7569046a725dcfa95dae4d (diff)
parent340246794f822b67f6790e5b8ac533439b93022c (diff)
[automerger skipped] Merge "Revert "Check sound Uri permission when creating a notification channel"" into udc-dev am: 3ae0c47bdb -s ours am: 340246794f -s ours
am skip reason: Merged-In If5a6c80e3bd665a9e67655a230e43d704422082b with SHA-1 4979f0bdd9 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/32072167 Change-Id: Ie97dfd2c44e684642c44ca5119f2d2bb86db0560 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