commit | 4e6f8b82e6eb8c20f359639e5fbd12dad93db462 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 19:35:59 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 19:35:59 2023 +0000 |
tree | 2311ae92fe2905adf41d3f170a3584e068cba92c | |
parent | cfac505757bc564ffc90d28521b3b9b6875c3961 [diff] | |
parent | 216cc90d64e9ed8edaa14c09fcb76804c5a4f62e [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours am: 16f950f41f -s ours am: 31c96f00e1 -s ours am: 7bf8adb31e -s ours am: 216cc90d64 -s ours am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526 Change-Id: I62cca77dea4d5e86419e15789022b322039fa0de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>