| commit | e1ba103a2817c2bb0abdda473c70b29d73d6daac | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 03 07:50:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 07:50:13 2023 +0000 |
| tree | a38e35191f43c5b035a23ff8bbae1b0bbe809d85 | |
| parent | 5ea4726de53de943e788c852612c0a0f49f4ed87 [diff] | |
| parent | 8588788671c1e1ad256efd18d342895c3572c74c [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: e71a0ed9aa -s ours am: a36cb7f425 -s ours am: 8588788671 -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: I017bf4828b8cc268320ff52a3f9b6a767f0b941b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>