commit 1080c8d129afe82d21966ace787985929cff2ca5
author Yifan Hong <elsk@google.com> Fri Dec 02 08:14:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 02 08:14:04 2016 +0000
tree 60dd923919e12ef11d1b5b6bbb8c60d9354935f8
parent 70bcc3139cbd1cbb7cab1ffbd982c170f8003b41
parent c1a60f1fd38742348a486b44e4ec90c0f25fec70

Merge "Update to use the correct logging library." am: 48f6298fa3 am: 82c7db6e9f am: 42792cd5e4
am: c1a60f1fd3

Change-Id: I2893788bbc1c0b50bc62c9094985ccf095161a3d

boot/1.0/default/BootControl.cpp

diff --git a/boot/1.0/default/BootControl.cpp b/boot/1.0/default/BootControl.cpp
index 56d7b33..54c1928 100644
--- a/boot/1.0/default/BootControl.cpp
+++ b/boot/1.0/default/BootControl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #define LOG_TAG "android.hardware.boot@1.0-impl"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/boot_control.h>

nfc/1.0/default/Nfc.cpp

diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp
index bee374d..44c8e42 100644
--- a/nfc/1.0/default/Nfc.cpp
+++ b/nfc/1.0/default/Nfc.cpp
@@ -1,5 +1,5 @@
 #define LOG_TAG "android.hardware.nfc@1.0-impl"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/nfc.h>