| commit | 47d4653215fd2a43d1a257126c0c11f8897ae359 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 17:18:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:18:57 2023 +0000 |
| tree | a031671b394968581330f6260726a01a0e5df1fa | |
| parent | c61020a6017ec46e793c90f5d11afb5b0d54d573 [diff] | |
| parent | 209aac92901ef3f7afbb9e17f60a7fd722a9e6cc [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: 945b8c01fa -s ours am: 6ee9aea085 -s ours am: 209aac9290 -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: Ibeffd97ceb52807ed5ab214812e47ec372bb49b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>