| commit | 020addb64fdcda35eff304efe61e89f184f98283 | [log] [tgz] |
|---|---|---|
| author | Anton Potapov <apotapov@google.com> | Thu Aug 03 00:57:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 00:57:41 2023 +0000 |
| tree | f02803743865308e3f9d979991b4d3b65550c501 | |
| parent | f1f578c3f155d6545c7464169b007be3b59b51b4 [diff] | |
| parent | 373c5ac49e78467827763bdbf2fa0252d1cd961b [diff] |
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e021f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: Icedc57c9c52c15042fa39b259c7d2a01dbb11155 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>