diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-11 19:26:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 19:26:19 +0000 |
| commit | a45b1d6f38047760bf206889517cc43c012d1317 (patch) | |
| tree | 2b83fbcfcbde29b5b2bfe39568d13841d0267252 /gatekeeperd | |
| parent | dc783813993a1fafbe569cedd11b756c6f8ad606 (diff) | |
| parent | 5482cb01b23f948e36e34002dab5ada8baeef406 (diff) | |
| download | core-a45b1d6f38047760bf206889517cc43c012d1317.tar.gz core-a45b1d6f38047760bf206889517cc43c012d1317.tar.bz2 core-a45b1d6f38047760bf206889517cc43c012d1317.zip | |
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7 am: c3b346ea93
am: 5482cb01b2
Change-Id: Ifaf21912d44f6ee9fda06df255ba3f7a4ca26ed7
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/gatekeeperd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index 49a884141..96bda07a5 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp @@ -24,7 +24,6 @@ #include <stdint.h> #include <unistd.h> -#include <android/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/PermissionCache.h> @@ -33,6 +32,7 @@ #include <hardware/hw_auth_token.h> #include <keystore/IKeystoreService.h> #include <keystore/keystore.h> // For error code +#include <log/log.h> #include <utils/Log.h> #include <utils/String16.h> |