| commit | 883217b267a8340abef38e28102991b84db157b8 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Wed Aug 02 15:02:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 15:02:06 2023 +0000 |
| tree | b392fba31a9cf92f788d71cc096bf3a31e580261 | |
| parent | d30a214e5d4c0eb99ebe776d6bdc0b281fcb7cdf [diff] | |
| parent | 17e0b2c547da46246b0a33fae9821c1cfa5f8502 [diff] |
[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: 8eb9a03813 -s ours am: 3d10caad63 -s ours am: 05189c1215 -s ours am: c802152381 -s ours am: 17e0b2c547 -s ours am skip reason: Merged-In Ibe4fb69a90904787b9f97a7cd90d318a047d1e11 with SHA-1 2be24a7804 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23982204 Change-Id: Ia0e95c66b82c05a660448f25ada4ea246a70f917 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>