| commit | 5cd8b0964afe0daf90ede5bc6023899c36c99f40 | [log] [tgz] |
|---|---|---|
| author | András Kurucz <kurucz@google.com> | Wed Mar 01 12:04:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 01 12:04:50 2023 +0000 |
| tree | 7cf3f3c7f049b8f3cc03cde7e6c8ac4650a2f4e1 | |
| parent | 9e0d5a373741337bd0f958d68f8d2159948a40a4 [diff] | |
| parent | 608cb461f031f5b7b5d13c7a6ba596bf793dedd4 [diff] |
[automerger skipped] Merge "Restore empty ZenRule#conditionId after a device restart" into tm-qpr-dev am: 710d3976a0 am: 6315fcdb79 -s ours am: 608cb461f0 -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: Icc9a0d6284b717fbf4fd4ffff2374a458277b505 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>