| commit | 6a67ea5e7dee8df1094344d976cca25e0bb4e7a3 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:19:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:19:43 2023 +0000 |
| tree | a031671b394968581330f6260726a01a0e5df1fa | |
| parent | 47d4653215fd2a43d1a257126c0c11f8897ae359 [diff] | |
| parent | 4b8cc516672fcd35932fecbffb789516b95c4b33 [diff] |
Merge "[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" into udc-d1-dev-plus-aosp am: c2bf412e2d -s ours am: 4b8cc51667 -s ours am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982566 Change-Id: I33c7d59464c7b6407cf77d4bf44603b7711fc7f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>