| commit | fb07fc02843354a22592382e26cf9b92cffd1bba | [log] [tgz] |
|---|---|---|
| author | Josh Tsuji <tsuji@google.com> | Fri Feb 14 19:59:18 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 14 19:59:18 2020 +0000 |
| tree | 5dc9e5477a04217f41c473300b8f1a2d8ca909b0 | |
| parent | c6b89516e3ed126f1ec852b57b055214937cff57 [diff] | |
| parent | 6b34e2b0045138c671425c32708350de7841b640 [diff] |
Merge "Adds currentlyResolvingConflicts to the coordinator."