| commit | 178a958149fc4fd19cd25fbe2108a0539bc50056 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 19:09:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 19:09:40 2023 +0000 |
| tree | 2012fc5ee91b70e5b0254a729eb42ddba1709206 | |
| parent | f18932028bf3cb0260dd4d8e5aeb8f61604b6073 [diff] | |
| parent | 1e2468f4d6ac1d62cc5d91f81f8a1a78f840684a [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: 6394c42623 -s ours am: 72b88be502 -s ours am: 1e2468f4d6 -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: Id93be8c9fb3027497b27db571c5661feab4669f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>