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/BackupData.cpp | |
| 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/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 { |