| commit | ed8557f2013857bada7fead2f12cbb69c4e62c3e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 06:10:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 06:10:49 2023 +0000 |
| tree | 8413ececf10d6fe4ea7872d3be668cb809418337 | |
| parent | d2708119203353c715b7e3ae1d67e15520a94a18 [diff] | |
| parent | 475ef3e2c13ace315463a7cad783525cce699c84 [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: 42fd03e73e -s ours am: 7499a939df -s ours am: 475ef3e2c1 -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: I88bd6a31f19a870095de8888aff0460c847c1b8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>