diff options
author | Josh Gao <jmgao@google.com> | 2016-08-05 00:39:16 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2016-08-05 00:39:16 -0700 |
commit | 1286c1f878ebbd8389745608ac57c75666822a4f (patch) | |
tree | f2c12dd304c95f1b3696658c4e91e21b3506f920 /adb/file_sync_client.cpp | |
parent | 4ff7f9f62ae5d283fb62ee87c615a801642cba8f (diff) |
adb: correctly fix merge conflict.
Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2
Diffstat (limited to 'adb/file_sync_client.cpp')
-rw-r--r-- | adb/file_sync_client.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp index 5222560549..56ff68c582 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); |