| commit | 6b34e2b0045138c671425c32708350de7841b640 | [log] [tgz] |
|---|---|---|
| author | Joshua Tsuji <tsuji@google.com> | Thu Feb 13 16:13:23 2020 -0500 |
| committer | Joshua Tsuji <tsuji@google.com> | Thu Feb 13 16:40:56 2020 -0500 |
| tree | 1456dd95bf22212b4e36f03419131ebcad99386f | |
| parent | dc68d926033f889d4e22b9dffea12857843aa59e [diff] |
Adds currentlyResolvingConflicts to the coordinator. This allows users to call onContentMoved with impunity, simplifying code. Test: atest SystemUITests Change-Id: Ica8f9ecc79c1a452cbcb004a1089538b23eb0603