From 1286c1f878ebbd8389745608ac57c75666822a4f Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Fri, 5 Aug 2016 00:39:16 -0700
Subject: [PATCH] adb: correctly fix merge conflict.

Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2
---
 adb/file_sync_client.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index 522256054..56ff68c58 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -677,9 +677,8 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath,
 
         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);