[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c93 am: 373c5ac49e -s ours am: 020addb64f -s ours am: d2983b8a0e -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: I81171a9c9e0584864d175ec88ff5f1fbd53f740b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Anton Potapov

2023-08-03 02:25:59 +00:00

committed by Automerger Merge Worker

parent 8fd7bfdec1 d2983b8a0e

commit a917310e04

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