Skip to content
Commit f6a0311d 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 sc-dev am: 38e2c006 am: f049b209 -s ours am: 306f04b9 -s ours am: 5e764ff3 -s ours

am skip reason: Merged-In Ibe4fb69a90904787b9f97a7cd90d318a047d1e11 with SHA-1 2be24a78 is already in history

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



Change-Id: I2dc78784b4a4798014cf1015af0d7288020fe7b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31c96f00 5e764ff3
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