commit 5ed6153bf3c818584a745c91912880303cfc13f0
author Josh Gao <jmgao@google.com> Fri Aug 05 16:05:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 05 16:05:50 2016 +0000
tree 02eb1cc3d2a5334af5c2b70fcefef468f5108a5c
parent fc257debf0db6980559bab39d18fe0e89a1c58ca
parent 5e65aa936effce6a15eb2fb7b3f88345064a6f7e

adb: correctly fix merge conflict. am: 1286c1f878 am: d067dcdaa3
am: 52dd7ae138

Change-Id: I189c5f2caf7e5fbe278c641720daca2e80084477

adb/file_sync_client.cpp

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index 5222560..56ff68c 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/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);