commit 71058112d18d3c0d4832c0080259cb15430f8d89
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 13 07:29:18 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 13 07:29:18 2017 +0000
tree eb691fb977abe787aa7b1049aa0b18715126ce1a
parent 3a26a27641f9e3086d7df889867946d440a64c87
parent 08ddffbd976f97a994d70d909f933dff95569e6f

release-request-2ec08f61-b94c-464b-8a22-2d354ef71488-for-git_oc-dr1-release-4094616 snap-temp-L42100000073564610

Change-Id: I03650d8bdd43b9ea94c8273666895c6bfb100d59

src/google/protobuf/stubs/common.cc

diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc
index d443e8a..3a33b55 100644
--- a/src/google/protobuf/stubs/common.cc
+++ b/src/google/protobuf/stubs/common.cc
@@ -53,8 +53,10 @@
 #error "No suitable threading library available."
 #endif
 #if defined(__ANDROID__)
+#ifdef GOOGLE_PROTOBUF_MIN_LOG_LEVEL
 #include <android/log.h>
 #endif
+#endif
 
 namespace google {
 namespace protobuf {