commit | a6b7bb6a0c7830acb181de02cf2d10a3c692ac8c | [log] [tgz] |
---|---|---|
author | Anton Potapov <apotapov@google.com> | Tue Aug 01 14:47:43 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 14:47:43 2023 +0000 |
tree | e9579630e51f70ce60886777237bb522c29c0ed9 | |
parent | 3cdf69f3c72995b3308094602f5e1571144bcd62 [diff] | |
parent | 0b3edb1946cb74cf641418e09e549ef6201b0013 [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-dev am: cdd1be4645 am: 0b3edb1946 -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: If2d1f1e9a47bdf2006c848f78f87bed680f461c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>