| commit | d30a214e5d4c0eb99ebe776d6bdc0b281fcb7cdf | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 15:01:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 15:01:48 2023 +0000 |
| tree | b392fba31a9cf92f788d71cc096bf3a31e580261 | |
| parent | 1838ffe5d21dd58ebd6b658525db8864bf6e22c4 [diff] | |
| parent | 7a32394af7de5ac6a86c0d6b99ec381f6b136c20 [diff] |
Merge "[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c00694 am: f049b2096f -s ours am: 306f04b9c6 -s ours am: 5e764ff33d -s ours am: f6a0311dde -s ours am: 3aa758cebb -s ours am: 72c2203bde -s ours" into udc-d1-dev-plus-aosp am: 7a32394af7 -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/+/23982204 Change-Id: Ife9ebe1ba386bb18de02fcd3c4d49410733c9c85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>