diff options
| author | 2017-01-11 15:45:46 +0000 | |
|---|---|---|
| committer | 2017-01-11 15:45:46 +0000 | |
| commit | 082a1721b5165420e11319b98eefaa35d0feb844 (patch) | |
| tree | bc3c1b7e76fb41a950cd988903496e761b5c1d66 /libs/androidfw/BackupData.cpp | |
| parent | 46c39f6c3640dabc3e5eb5d37460f0b3d0622da6 (diff) | |
| parent | ef8ccc8510d2c66c4807f15962c3d53235af5fc5 (diff) | |
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510
Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
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 { |