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

am: 33807cd6c2

Change-Id: I341970b6ddb6610418d85a378ef2984861858c65
This commit is contained in:
Mark Salyzyn 2017-01-12 23:54:38 +00:00 committed by android-build-merger
commit 07388af1e6
2 changed files with 2 additions and 2 deletions

View file

@ -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"

View file

@ -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>