Skip to content
Commit 6b34e2b0 authored by Joshua Tsuji's avatar Joshua Tsuji
Browse files

Adds currentlyResolvingConflicts to the coordinator. 

This allows users to call onContentMoved with impunity, simplifying code.

Test: atest SystemUITests
Change-Id: Ica8f9ecc79c1a452cbcb004a1089538b23eb0603
parent dc68d926
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