diff options
| author | 2017-01-11 08:30:03 -0800 | |
|---|---|---|
| committer | 2017-01-11 08:30:17 -0800 | |
| commit | db15537e6e0d35c7ed3b1bef45e421760be70683 (patch) | |
| tree | a37853e5f3889f478cbcd204b46d1c8c640215f2 /libs/androidfw/include | |
| parent | 505d8262ab8702fea19c926bdff4d66bbbaa766a (diff) | |
| parent | 082a1721b5165420e11319b98eefaa35d0feb844 (diff) | |
resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
Diffstat (limited to 'libs/androidfw/include')
| -rw-r--r-- | libs/androidfw/include/androidfw/CursorWindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/include/androidfw/CursorWindow.h b/libs/androidfw/include/androidfw/CursorWindow.h index 8a2979a3756d..f54356576551 100644 --- a/libs/androidfw/include/androidfw/CursorWindow.h +++ b/libs/androidfw/include/androidfw/CursorWindow.h @@ -17,11 +17,11 @@ #ifndef _ANDROID__DATABASE_WINDOW_H #define _ANDROID__DATABASE_WINDOW_H -#include <cutils/log.h> #include <stddef.h> #include <stdint.h> #include <binder/Parcel.h> +#include <log/log.h> #include <utils/String8.h> #if LOG_NDEBUG |