tree c3985a51e1fecbfeedbcb34d36a144c6684da2fe
parent 81819774183a0762362b060d239c6ab3e53e19f6
parent 62a0a85ca15640a0cfff675a976ef91c79225128
author Lucas Dupin <dupin@google.com> 1694667986 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694667986 +0000

[automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e2e am: c96975247f -s ours am: e87f1fc19f -s ours am: 62a0a85ca1 -s ours

am skip reason: Merged-In I8807d1d58b58f1e5c990c21cef6a810e8b13c1db with SHA-1 c9c3e0f81a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24422641

Change-Id: Ibf84393eb145ebfe612ba0e001390b535cd58c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>