diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-08 22:15:20 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-08 22:15:20 -0700 |
| commit | 5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c (patch) | |
| tree | 668ba5aff67786080794908d01ae27f2305d13bd /libs/gui/ConsumerBase.cpp | |
| parent | 0b12929fddd9a4b3c9a857ea360213ffd6e60ef2 (diff) | |
| parent | 86aeb9ef154d7aa63c58cbe5be62e5b61d6ae5fa (diff) | |
| download | frameworks_native-5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c.zip frameworks_native-5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c.tar.gz frameworks_native-5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c.tar.bz2 | |
resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index f19b6c7..e476c9a 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -39,11 +39,11 @@ #include <utils/Trace.h> // Macros for including the ConsumerBase name in log messages -#define CB_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) -#define CB_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) -#define CB_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__) -#define CB_LOGW(x, ...) ALOGW("[%s] "x, mName.string(), ##__VA_ARGS__) -#define CB_LOGE(x, ...) ALOGE("[%s] "x, mName.string(), ##__VA_ARGS__) +#define CB_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__) +#define CB_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__) +#define CB_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__) +#define CB_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__) +#define CB_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__) namespace android { |