commit aeeffc92d57e61756ee43cd1f2e6cbac4b6ebc29
author Mark Salyzyn <salyzyn@google.com> Thu Jan 12 23:57:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 23:57:31 2017 +0000
tree 807363cc71cec77bf813305e10c29afef60bc7de
parent 69c8381618e7356677aef3e367000f8919187651
parent a1d9bfa4f806f887d7dbd21718a26c1650144c1a

Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95 am: 33807cd6c2
am: 07388af1e6

Change-Id: I3789497189d23724824babaacbc8aa442e7a026c

debuggerd/crasher.cpp

diff --git a/debuggerd/crasher.cpp b/debuggerd/crasher.cpp
index e650f22..689f4d4 100644
--- a/debuggerd/crasher.cpp
+++ b/debuggerd/crasher.cpp
@@ -29,8 +29,8 @@
 #include <unistd.h>
 
 // We test both kinds of logging.
-#include <android/log.h>
 #include <android-base/logging.h>
+#include <log/log.h>
 
 #if defined(STATIC_CRASHER)
 #include "debuggerd/client.h"

include/utils/KeyedVector.h

diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h
index 42de401..f93ad6e 100644
--- a/include/utils/KeyedVector.h
+++ b/include/utils/KeyedVector.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/Errors.h>
 #include <utils/SortedVector.h>
 #include <utils/TypeHelpers.h>