diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-07 23:59:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-07 23:59:44 +0000 |
| commit | ef119a14b8f5a7eca18930e272e550ebf25217bd (patch) | |
| tree | dd071144e0c615cb93d5f03e0697736674452461 /fastboot/fastboot.cpp | |
| parent | 088113f419a50f360efa66efd9d88df849576e45 (diff) | |
| parent | 3608ee5e903689ea7c433587be664649689816e1 (diff) | |
Merge "Track rename of base/ to android-base/." am: 912ed3d8ca am: e2a9563be1
am: 3608ee5e90
* commit '3608ee5e903689ea7c433587be664649689816e1':
Track rename of base/ to android-base/.
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index afdfd0ebc..ddd038746 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -44,13 +44,13 @@ #include <unistd.h> #include <functional> -#include <base/parseint.h> -#include <base/strings.h> +#include <android-base/parseint.h> +#include <android-base/strings.h> #include <sparse/sparse.h> #include <ziparchive/zip_archive.h> -#include <base/strings.h> -#include <base/parseint.h> +#include <android-base/strings.h> +#include <android-base/parseint.h> #include "bootimg_utils.h" #include "fastboot.h" |