| commit | 6bf0547ccce72233bd465178b919fa7f15e48b45 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Dec 04 17:55:33 2015 -0800 |
| committer | Elliott Hughes <enh@google.com> | Fri Dec 04 17:55:33 2015 -0800 |
| tree | ddf19293b96d3be7929a1be9343fbf393788b009 | |
| parent | 51c6b9876a0fa4f0570364b8dc3c4c0351dcd797 [diff] [blame] | |
| parent | b7d5a47cec7e97b5d73945804e8a41d52a36596b [diff] [blame] |
resolve merge conflicts of b7d5a47cec to master. Change-Id: I0c5211a00d92d0ee796bb9c77d2e13675a2a3e8d
diff --git a/CryptCommandListener.cpp b/CryptCommandListener.cpp index 9feb5ec..ac2607a 100644 --- a/CryptCommandListener.cpp +++ b/CryptCommandListener.cpp
@@ -31,8 +31,8 @@ #define LOG_TAG "VoldCryptCmdListener" -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include <cutils/fs.h> #include <cutils/log.h>