diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-02-01 13:22:37 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-01 13:22:37 -0800 |
| commit | 791b843bcb2b4f2fcc48961b021c0c60e9c172ec (patch) | |
| tree | 1587601f24c7cbd6ebc01b1ed077a611cbc6cd06 /keymaster | |
| parent | 7490d24374f12e1d3882de96be0b587d8563075f (diff) | |
| parent | 1e45903dd51de24ee4205064892788b9b172df14 (diff) | |
| download | android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.tar.gz android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.tar.bz2 android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.zip | |
Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db125860 am: 4a1f714ed0
am: 1e45903dd5
Change-Id: I1a54776b7560154304573a8cd3dfeae5babf43e5
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/3.0/default/KeymasterDevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp index 6fabbde99..7d3e6f25d 100644 --- a/keymaster/3.0/default/KeymasterDevice.cpp +++ b/keymaster/3.0/default/KeymasterDevice.cpp @@ -19,7 +19,7 @@ #include "KeymasterDevice.h" -#include <cutils/log.h> +#include <log/log.h> #include <AndroidKeymaster3Device.h> #include <hardware/keymaster0.h> |