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

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

[automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a78 -s ours am: c1b0b217 -s ours

am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f08 is already in history

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



Change-Id: I915163e836a96b771bc9cd61448ec7ec424d1ba1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8884c55 c1b0b217
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