summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
author AndrĂ¡s Kurucz <kurucz@google.com> 2023-03-01 12:03:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-01 12:03:29 +0000
commit608cb461f031f5b7b5d13c7a6ba596bf793dedd4 (patch)
tree76d4cfd9bb44e3083eb3c68c1c1b8e34c9b66226 /packages/SettingsLib/src
parenta2abc8fb1266c3679be4082eaf4f5a584c5c276f (diff)
parent6315fcdb79d3530e0dcb280b0d91b7e9d883a4bf (diff)
[automerger skipped] Merge "Restore empty ZenRule#conditionId after a device restart" into tm-qpr-dev am: 710d3976a0 am: 6315fcdb79 -s ours
am skip reason: Merged-In I2e00c79216734f6c2db7d5b1347ab72a9be5cdc3 with SHA-1 1cc88e7742 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21542004 Change-Id: Ib175f168bbe3db6b85fb79e00024a8139e0545e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages/SettingsLib/src')
0 files changed, 0 insertions, 0 deletions