diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-04 17:55:33 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-12-04 17:55:33 -0800 |
| commit | 6bf0547ccce72233bd465178b919fa7f15e48b45 (patch) | |
| tree | ddf19293b96d3be7929a1be9343fbf393788b009 /main.cpp | |
| parent | 51c6b9876a0fa4f0570364b8dc3c4c0351dcd797 (diff) | |
| parent | b7d5a47cec7e97b5d73945804e8a41d52a36596b (diff) | |
| download | android_system_vold-6bf0547ccce72233bd465178b919fa7f15e48b45.tar.gz android_system_vold-6bf0547ccce72233bd465178b919fa7f15e48b45.tar.bz2 android_system_vold-6bf0547ccce72233bd465178b919fa7f15e48b45.zip | |
resolve merge conflicts of b7d5a47cec to master.
Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -23,8 +23,8 @@ #include "cryptfs.h" #include "sehandle.h" -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include <cutils/klog.h> #include <cutils/properties.h> #include <cutils/sockets.h> |