commit 7d0e0fc6801099013af6209c7021a5f1d9d0cff6
author Elliott Hughes <enh@google.com> Tue Aug 25 11:26:40 2015 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 25 11:26:40 2015 -0700
tree 93630410c05ffb87c6bcba0f0683d6bbdedd49f5
parent 2697c01c5462e343d43592ee34f5e684267dac22
parent d00ca7d3b73bd5a2b67342714cfc75fff38c3dce

resolved conflicts for merge of 068ee4d0 to mnc-dr-dev-plus-aosp

Change-Id: Ie7b2673e24ce4880c20112d64164cec228ca5755

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index 85170ad..fb49f5e 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -305,7 +305,7 @@
     gid_t gid = -1;
     uint64_t cap = 0;
     if (should_use_fs_config(path)) {
-        unsigned int broken_api_hack;
+        unsigned int broken_api_hack = mode;
         fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &cap);
         mode = broken_api_hack;
     }