| commit | 42fd03e73ec5a719a37f584a256d846face96010 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 04:38:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 04:38:01 2023 +0000 |
| tree | e9579630e51f70ce60886777237bb522c29c0ed9 | |
| parent | 43a466ecdf52f1c60986a1023bb5ac96f631ecb5 [diff] | |
| parent | 501cddc99b1e8da46c439172556fdf85757a4e93 [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: f0ad126270 -s ours am: 501cddc99b -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: I078ab1a3b9cb6b5eb89a4bc8b71f36e09282c770 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>