[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: 4e3309033f -s ours

Browse Source

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: I6c600ff65a300a04453573a05b97bdb0f8848217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Treehugger Robot

2023-08-03 04:43:11 +00:00

committed by Automerger Merge Worker

parent 699fac4aa2 4e3309033f

commit 0425b69c81

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available