summaryrefslogtreecommitdiffstats
path: root/sync/engine/resolve_conflicts_command_unittest.cc
Commit message (Expand)AuthorAgeFilesLines
* [Sync] Move 'sync' target to sync/akalin@chromium.org2012-03-151-0/+51