diff options
| author | 2017-01-11 17:12:59 +0000 | |
|---|---|---|
| committer | 2017-01-11 17:13:02 +0000 | |
| commit | 7a98aee66a277a8e336180f42b439835cc23512b (patch) | |
| tree | dd22404df2673140a01610478af39267d27b4ba8 /libs/androidfw/BackupData.cpp | |
| parent | 74bf35017635f896c449f78d37144124d445b918 (diff) | |
| parent | db15537e6e0d35c7ed3b1bef45e421760be70683 (diff) | |
Merge "resolve merge conflicts of 082a1721b516 to master"
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
| -rw-r--r-- | libs/androidfw/BackupData.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/androidfw/BackupData.cpp b/libs/androidfw/BackupData.cpp index ba4a4ff4fe63..76a430ee9f0e 100644 --- a/libs/androidfw/BackupData.cpp +++ b/libs/androidfw/BackupData.cpp @@ -16,14 +16,13 @@ #define LOG_TAG "backup_data" -#include <androidfw/BackupHelpers.h> -#include <utils/ByteOrder.h> - #include <stdio.h> #include <string.h> #include <unistd.h> -#include <cutils/log.h> +#include <androidfw/BackupHelpers.h> +#include <log/log.h> +#include <utils/ByteOrder.h> namespace android { |