| commit | c9573e1f27cc38a47b8c46a6892a802523616297 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 20:48:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 20:48:46 2023 +0000 |
| tree | e19ab4d45b426a260f964b32a082be96a7a5710c | |
| parent | 3fde2a8fa3597f77e61d40063bffbf0cc1e4b7ca [diff] | |
| parent | 9e7147801f06c1772d81970a344f2c9b21b022e7 [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: 4ce9c15224 -s ours am: 9e7147801f -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: If06037b1724610fcd4bd0efc65cb61f1bf445493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>