commit | 6394c42623900fb9c05ff9119145dcabed412d1c | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 17:19:12 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:19:12 2023 +0000 |
tree | 0e5c756893761581981580c8722a80f32b62466a | |
parent | 78f6c79a1b6fb549299efc555f9a918f6e707167 [diff] | |
parent | 16f950f41ff8485e22908d31082d03bc2110e08a [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 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: I3455b1bab3c440ed789705697b148ce5359b07a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>