Skip to content
Commit 16f318ea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use removeActiveDevice() when set phone as active... 

[automerger skipped] Merge "Use removeActiveDevice() when set phone as active device" am: d63d2456 am: 710aa1f5 -s ours am: 2a41d41e -s ours
am skip reason: Change-Id Icfe6a50ba3fc807daf3445cfdd852787dc26e3c1 with SHA-1 531382fe is in history

Change-Id: Ie36ca26d06825cf63c13eaeaf0665fa00eaf7890
parents b2c38abe 2a41d41e
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