commit ff2dcd9af994a23ed483939a416b48bdc10eefd5
author Mark Salyzyn <salyzyn@google.com> Wed Sep 28 15:54:45 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Sep 30 12:47:05 2016 -0700
tree 6e5a0dfe4e39c407eea7e39840eef5d56b720de4
parent 66ce3e08c5632a20ea66bde6dd76397041edf034

system/core Replace log/log.h with android/log.h

Should use android/log.h instead of log/log.h as a good example
to all others.  Adjust header order to comply with Android Coding
standards.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I33a8fb4e754d2dc4754d335660c450e0a67190fc

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index b0b31f1..7b00d9d 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -92,10 +92,10 @@
 #include <unordered_map>
 #include <vector>
 
+#include <android/log.h>
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <paths.h>
-#include <log/log.h>
 
 #include "adb.h"
 #include "adb_io.h"