Merge "Fix failure to copy data files if content changes"
authorAdrian Grange <agrange@google.com>
Tue, 17 Sep 2013 00:20:59 +0000 (17:20 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 17 Sep 2013 00:20:59 +0000 (17:20 -0700)

Trivial merge