commit 8fc9d685834cd65101a238d43a186a090937f927
author Josh Gao <jmgao@google.com> Fri Aug 05 00:39:16 2016 -0700
committer Josh Gao <jmgao@google.com> Fri Aug 05 00:39:16 2016 -0700
tree d5a7623dcc5901e43b310e92011af001f8da2151
parent 4e940c0ecb0b485576800df16ab65bb23281cc78

adb: correctly fix merge conflict.

Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2

file_sync_client.cpp

diff --git a/file_sync_client.cpp b/file_sync_client.cpp
index 5222560..56ff68c 100644
--- a/file_sync_client.cpp
+++ b/file_sync_client.cpp
@@ -677,9 +677,8 @@
 
         bytes_copied += msg.data.size;
 
-        sc.ReportProgress(name != nullptr ? name : rpath, bytes_copied, size);
         sc.RecordBytesTransferred(msg.data.size);
-        sc.ReportProgress(rpath, bytes_copied, size);
+        sc.ReportProgress(name != nullptr ? name : rpath, bytes_copied, size);
     }
 
     sc.RecordFilesTransferred(1);