diff options
| author | 2017-01-11 15:40:24 +0000 | |
|---|---|---|
| committer | 2017-01-11 15:40:24 +0000 | |
| commit | ef8ccc8510d2c66c4807f15962c3d53235af5fc5 (patch) | |
| tree | eeed237443ea2350067ec9501fde2d07c65b2f39 /libs/androidfw/BackupHelpers.cpp | |
| parent | d544a4c682232f5bd3ae5d6eb5a11c978ddcf6aa (diff) | |
| parent | 6143cbf1e5ab5e879044748c497e05b36ad4c36a (diff) | |
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5
Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
| -rw-r--r-- | libs/androidfw/BackupHelpers.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index 78e9d91c4d67..8bfe2b6a259a 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -18,23 +18,22 @@ #include <androidfw/BackupHelpers.h> -#include <utils/KeyedVector.h> -#include <utils/ByteOrder.h> -#include <utils/String8.h> - #include <errno.h> -#include <sys/types.h> -#include <sys/uio.h> -#include <sys/stat.h> -#include <sys/time.h> // for utimes +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/time.h> // for utimes +#include <sys/uio.h> #include <unistd.h> #include <utime.h> -#include <fcntl.h> #include <zlib.h> -#include <cutils/log.h> +#include <log/log.h> +#include <utils/ByteOrder.h> +#include <utils/KeyedVector.h> +#include <utils/String8.h> namespace android { |