| commit | 9f3c93f5e3f68e8207888efa51ca464de9ff189d | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 19:39:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 19:39:40 2023 +0000 |
| tree | 10da0a01f7fa9f70d9d89fb9ae50183b2e5b5225 | |
| parent | 86bdba2eff759a438a234c01a0a3f184cef68fad [diff] | |
| parent | 823f6c0c1b1d86556dff79008e825bfc4b8f4427 [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: 956623c6c0 -s ours am: 823f6c0c1b -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: I8096304b3263b36446a8b7b84411493ef6160012 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>