am 71619f13: am 604f52e3: Reconcile with AOSP master
* commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':
diff --git a/include/cutils/log.h b/include/cutils/log.h
index 5a7c2e1..42d7382 100644
--- a/include/cutils/log.h
+++ b/include/cutils/log.h
@@ -79,7 +79,6 @@
#else
#define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
#endif
-#define ALOGV LOGV
#endif
#define CONDITION(cond) (__builtin_expect((cond)!=0, 0))
@@ -93,7 +92,6 @@
? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \
: (void)0 )
#endif
-#define ALOGV_IF LOGV_IF
#endif
/*
@@ -164,7 +162,6 @@
#else
#define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG)
#endif
-#define IF_ALOGV IF_LOGV
#endif
/*