commit | 35b3568b0b44422409e6d734df16eccc0698037b | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 16:11:47 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 16:11:47 2023 +0000 |
tree | 64c6e6d99ef82debb4e87d500175d0cbef7cd0aa | |
parent | 63e37445f9c4a77e5082048a14eecdaa9cc5af6a [diff] | |
parent | b221d1d6978c3dc8185130eb9b63ae96daadb009 [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: c8884c55e9 -s ours am: 91262ffdcb -s ours am: b221d1d697 -s ours am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566 Change-Id: Iedd63d1d287aea34a630ed07e6052280b6dd38e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>