| commit | 13518fc746ddb15b541e5b065e6eb8645fe862de | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Tue Aug 01 19:40:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 19:40:19 2023 +0000 |
| tree | 10da0a01f7fa9f70d9d89fb9ae50183b2e5b5225 | |
| parent | ee7f3e38e2b1f0920f17da950014d4699977ea67 [diff] | |
| parent | 4a70d4f38daf354498ec3ed06d25b4644326b5b2 [diff] |
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev am: fee30bd247 -s ours am: 16f950f41f -s ours am: 6394c42623 -s ours am: 72b88be502 -s ours am: 1e2468f4d6 -s ours am: 178a958149 -s ours am: 4a70d4f38d -s ours am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526 Change-Id: I9b48ab517252225ad0cecaa4452e7b39d3e1895a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>