| commit | ba704fa2f343ab4a8e30846f851ad193514254fe | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 16:13:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 16:13:38 2023 +0000 |
| tree | dc8dcd16dddeecb320fd5cbaf6b10770abbd2a6e | |
| parent | c0367085f30f56df4b382fb30ee190ad2d3e372c [diff] | |
| parent | be99c8cf82c0128e870b2515e2526b37bf93662e [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: 0b3edb1946 -s ours am: a6b7bb6a0c -s ours am: 7b492dd0a1 -s ours am: be99c8cf82 -s ours am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c61 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566 Change-Id: I25ba83e785d214bec8c52cb12b16b43add1ffc62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>