summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-08-01 00:25:09 -0500
committerGerrit Code Review2018-08-01 00:25:09 -0500
commit52126a414b9f6b7dd0465a80d51040cc3bb44133 (patch)
tree2bfa2e6822c797a82423c359cff89744990c344e
parent24f9fc7feed8735aea1588940a63c636e07e1ee8 (diff)
parent771ba0c057252d53955665ea1150e365e731543e (diff)
downloadplatform-system-core-52126a414b9f6b7dd0465a80d51040cc3bb44133.tar.gz
platform-system-core-52126a414b9f6b7dd0465a80d51040cc3bb44133.tar.xz
platform-system-core-52126a414b9f6b7dd0465a80d51040cc3bb44133.zip
Merge "adb: win32: fix Unicode console output"
-rw-r--r--adb/client/bugreport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/client/bugreport.cpp b/adb/client/bugreport.cpp
index 346bb4b2c..fe9873725 100644
--- a/adb/client/bugreport.cpp
+++ b/adb/client/bugreport.cpp
@@ -16,6 +16,8 @@
16 16
17#define TRACE_TAG ADB 17#define TRACE_TAG ADB
18 18
19#include "sysdeps.h"
20
19#include "bugreport.h" 21#include "bugreport.h"
20 22
21#include <string> 23#include <string>
@@ -24,8 +26,6 @@
24#include <android-base/file.h> 26#include <android-base/file.h>
25#include <android-base/strings.h> 27#include <android-base/strings.h>
26 28
27#include "sysdeps.h"
28
29#include "adb_utils.h" 29#include "adb_utils.h"
30#include "client/file_sync_client.h" 30#include "client/file_sync_client.h"
31 31