summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2023-09-14 04:55:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-14 04:55:54 +0000
commit62a0a85ca15640a0cfff675a976ef91c79225128 (patch)
tree24d8ed8db76646e92b8dd68dd97280ee4c0e6742 /libs/androidfw/AssetsProvider.cpp
parentd00f2901d3dd08fa9999e7d486fa26380b9258a7 (diff)
parente87f1fc19f2bdee6318e18e8b3d2ad21d8c73b83 (diff)
[automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e2e am: c96975247f -s ours am: e87f1fc19f -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: I84ce40949509a26ca077b79a93c432dc9c2ff322 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions