am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."

* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
  Don't return NULL from {Boxed}PrimitiveTypeName.

src/google/protobuf/compiler/javanano/javanano_helpers.cc

@@ -336,14 +336,14 @@ string PrimitiveTypeName(JavaType type) {
     case JAVATYPE_STRING : return "java.lang.String";
     case JAVATYPE_BYTES  : return "byte[]";
     case JAVATYPE_ENUM   : return "int";
-    case JAVATYPE_MESSAGE: return NULL;
+    case JAVATYPE_MESSAGE: return "";
 
     // No default because we want the compiler to complain if any new
     // JavaTypes are added.
   }
 
   GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
+  return "";
 }
 
 string BoxedPrimitiveTypeName(JavaType type) {
@@ -356,14 +356,14 @@ string BoxedPrimitiveTypeName(JavaType type) {
     case JAVATYPE_STRING : return "java.lang.String";
     case JAVATYPE_BYTES  : return "byte[]";
     case JAVATYPE_ENUM   : return "java.lang.Integer";
-    case JAVATYPE_MESSAGE: return NULL;
+    case JAVATYPE_MESSAGE: return "";
 
     // No default because we want the compiler to complain if any new
     // JavaTypes are added.
   }
 
   GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
+  return "";
 }
 
 string EmptyArrayName(const Params& params, const FieldDescriptor* field) {