commit | 216cc90d64e9ed8edaa14c09fcb76804c5a4f62e | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 18:49:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 18:49:00 2023 +0000 |
tree | 53fed17681c63ae78d6e6f4b672320908b004fde | |
parent | 3965b85e120074a75372e826319ecb4acdb19418 [diff] | |
parent | 7bf8adb31e4ce94ed22289dda084ce88ca13e41b [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 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: Ia1999e3d4eb85ca35470336fc944dafe55121bdf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>