| commit | 6ee9aea0852c5a131a7e93e3c5f3dbfbc176eecd | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 16:13:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 16:13:22 2023 +0000 |
| tree | 64c6e6d99ef82debb4e87d500175d0cbef7cd0aa | |
| parent | 72738f6f96d7470303c0bbe2acdfe6bf8306bbfa [diff] | |
| parent | 945b8c01fa7d577e96ac10e1a7703972e82efec6 [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: 945b8c01fa -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: I990a6723f89873611a875d171e99124be7271d8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>