commit | 956623c6c0df4f544c99bcce5381fb3d6ced3be1 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 18:47:25 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 18:47:25 2023 +0000 |
tree | 2012fc5ee91b70e5b0254a729eb42ddba1709206 | |
parent | e988d3413268185e0df11793d6d3a4ed47cabd9f [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: I97dc26613d4737c0aabc35cc0cfd9e891968609b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>