-Index: ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
+Index: src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
---- ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc	(revision 51ef8f39de376fe71ce5d2c682abe4f974cf8074)
-+++ ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc	(revision )
+--- src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc	(revision 51ef8f39de376fe71ce5d2c682abe4f974cf8074)
++++ src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc	(revision )
 @@ -198,8 +198,9 @@
    if (IsReferenceType(GetJavaType(descriptor))) {
      (*variables)["null_check"] =

   } else {
     (*variables)["null_check"] = "";
   }
Index: ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc	(revision 51ef8f39de376fe71ce5d2c682abe4f974cf8074)
+++ ../androidsrc/platform/external/protobuf/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc	(revision )
@@ -89,7 +89,8 @@
     "public $type$ get$capitalized_name$() { return $name$_; }\n"
     "public $message_name$ set$capitalized_name$($type$ value) {\n"

       "  }\n"
       "  if ($name$_.isEmpty()) {\n"
       "    $name$_ = new java.util.ArrayList<$type$>();\n"
Index: src/google/protobuf/compiler/javamicro/javamicro_message.cc
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/google/protobuf/compiler/javamicro/javamicro_message.cc	(revision 51ef8f39de376fe71ce5d2c682abe4f974cf8074)
+++ src/google/protobuf/compiler/javamicro/javamicro_message.cc	(revision )
@@ -363,12 +363,22 @@
     "  return ($classname$) (new $classname$().mergeFrom(data));\n"
     "}\n"
