Skip to content
Commit a6b7bb6a 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-dev am: cdd1be46 am: 0b3edb19 -s ours

am skip reason: Merged-In I60896a6f53307f0e97a9223b599a2891c6c0c08d with SHA-1 570aad7c is already in history

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



Change-Id: If2d1f1e9a47bdf2006c848f78f87bed680f461c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cdf69f3 0b3edb19
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