| commit | d892ae179e1a400368796cca19e216fd296531d1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 00:58:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 00:58:13 2023 +0000 |
| tree | f02803743865308e3f9d979991b4d3b65550c501 | |
| parent | 020addb64fdcda35eff304efe61e89f184f98283 [diff] | |
| parent | 4b74ba4435f0232d7166141b6efb6ed50b221a0e [diff] |
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93" into rvc-qpr-dev am: 4b74ba4435 -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: Ic31cc783397f3a29e7c29365044be2b52e91dcaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>