diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 22:12:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-30 22:12:45 +0000 |
| commit | 9fd2eaf827ffd3cc600a2851b74a1bcc52d19c70 (patch) | |
| tree | 54df91aa122bcd3fdc4a27ff10a8fe0f8a68361d /libcutils/tests/PropertiesTest.cpp | |
| parent | c528ac0fe81d334324cffb43b3ec3183042bb1c3 (diff) | |
| parent | f56fce02407b876338611c638d7f4b7fdc0f5d24 (diff) | |
| download | system_core-9fd2eaf827ffd3cc600a2851b74a1bcc52d19c70.tar.gz system_core-9fd2eaf827ffd3cc600a2851b74a1bcc52d19c70.tar.bz2 system_core-9fd2eaf827ffd3cc600a2851b74a1bcc52d19c70.zip | |
libcutils: Replace cutils/log.h with android/log.h am: 23ed4c242a
am: f56fce0240
Change-Id: I588c3a252594e1ecd4b34242217cf23c84e4af67
Diffstat (limited to 'libcutils/tests/PropertiesTest.cpp')
| -rw-r--r-- | libcutils/tests/PropertiesTest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libcutils/tests/PropertiesTest.cpp b/libcutils/tests/PropertiesTest.cpp index f66590bb4..f0cdffdc6 100644 --- a/libcutils/tests/PropertiesTest.cpp +++ b/libcutils/tests/PropertiesTest.cpp @@ -15,16 +15,17 @@ */ #define LOG_TAG "Properties_test" -#include <cutils/log.h> -#include <gtest/gtest.h> -#include <cutils/properties.h> #include <limits.h> -#include <string> -#include <sstream> + #include <iostream> +#include <sstream> +#include <string> +#include <android/log.h> #include <android-base/macros.h> +#include <cutils/properties.h> +#include <gtest/gtest.h> namespace android { |