| commit | f0ad126270b6cc9381b6ea1c11ac0b421ea90f50 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 03:12:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 03:12:20 2023 +0000 |
| tree | 909683d219412a132783f1b45c9671ab0dbe5687 | |
| parent | 412ad58640cbb293176e738ed68110a97f5b0528 [diff] | |
| parent | 2c60a72dce960c8d6d34e5a38ce315c4c5d54a85 [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: d892ae179e -s ours am: f715c988a2 -s ours am: 2c60a72dce -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: If835df376d2fea62848f10097f5793f59ff60f36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>