Skip to content
Commit 2ac7d5c7 authored by Anton Potapov's avatar Anton Potapov Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add userId check before loading icon in Device... 

[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc16 -s ours am: bc5800df -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24212143



Change-Id: Ib6dd5513c876915bdf7610f9c47b9f902d73b2b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da3dd126 bc5800df
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment