diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 22:51:26 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 22:51:26 +0000 |
| commit | c536d0ad364d28121e47c0d0237a0cc462a79342 (patch) | |
| tree | 937bf5370c179cfe8f645a0e0a670f8db1712b01 /sync/engine | |
| parent | b17d3b5564896a8b2e1b9ca9cbd6022caa456490 (diff) | |
| download | chromium_src-c536d0ad364d28121e47c0d0237a0cc462a79342.zip chromium_src-c536d0ad364d28121e47c0d0237a0cc462a79342.tar.gz chromium_src-c536d0ad364d28121e47c0d0237a0cc462a79342.tar.bz2 | |
Additional merge fixup from revert of 267374.
Merged change to file that moved since 267374 landed, and was missed during
the original revert.
BUG=320354,387707
TBR=rogerta@chromium.org
Review URL: https://codereview.chromium.org/355113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
0 files changed, 0 insertions, 0 deletions