| commit | c96243ba20ce72ed3966bbc77a9fd41d830d774a | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 16:15:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 16:15:15 2023 +0000 |
| tree | 63b38abb0c509d4c617482d86daf14fcc7525204 | |
| parent | 7e23d245a2f2c2e4742833ff8e36bec9e11da22e [diff] | |
| parent | ba704fa2f343ab4a8e30846f851ad193514254fe [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: be99c8cf82 -s ours am: ba704fa2f3 -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: I1a498142ac226ccc4580d83e3cf795c89e16595a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>