| commit | 4b8cc516672fcd35932fecbffb789516b95c4b33 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:08:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 17:08:09 2023 +0000 |
| tree | 63b38abb0c509d4c617482d86daf14fcc7525204 | |
| parent | 209aac92901ef3f7afbb9e17f60a7fd722a9e6cc [diff] | |
| parent | c2bf412e2dd22e6e3f8749db8521c76e38693198 [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 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: I273024740ae606b467eabaa328e1f7e4fd5ec1d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>