commit | 945b8c01fa7d577e96ac10e1a7703972e82efec6 | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 15:51:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 15:51:31 2023 +0000 |
tree | 878de7159789313fd25368d885d3193138f74520 | |
parent | ce126ccdfee090723285a18dc2ef34949a3e637a [diff] | |
parent | 7b492dd0a19e5a043efb62c796b2325ec32b8982 [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 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: If087c6b8fb731857ed93ea21c53394e2e588dc2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>