summaryrefslogtreecommitdiff
path: root/libs/binder/PersistableBundle.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2017-01-12 16:01:35 +0000
committer android-build-merger <android-build-merger@google.com> 2017-01-12 16:01:35 +0000
commita2c2d11f98b692401be56c8f285c570bae47ddda (patch)
tree121324bd98cb08f03e3b101fbfc85693745a9427 /libs/binder/PersistableBundle.cpp
parentde3d159226fd695219f55e6724c6c308ac0b7b7b (diff)
parentfbc97581511f1fa6aba808a970afa912706fbdea (diff)
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22 am: 16a30c1ac8
am: fbc9758151 Change-Id: I911936217c6b47f48092319ff66edafaf0f7c395
Diffstat (limited to 'libs/binder/PersistableBundle.cpp')
-rw-r--r--libs/binder/PersistableBundle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp
index 70d425e8d3..e7078baa82 100644
--- a/libs/binder/PersistableBundle.cpp
+++ b/libs/binder/PersistableBundle.cpp
@@ -20,9 +20,9 @@
#include <limits>
-#include <android/log.h>
#include <binder/IBinder.h>
#include <binder/Parcel.h>
+#include <log/log.h>
#include <utils/Errors.h>
using android::BAD_TYPE;