Merge pull request #5109 from haberman/integrate

Down-integrate from google3.

1 files changed, 2 insertions, 5 deletions

diff --git a/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java b/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
index e338af21..ff413720 100644
--- a/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
+++ b/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
@@ -33,12 +33,9 @@ package com.google.protobuf;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import protobuf_unittest.UnittestProto.TestAllTypes;
-
 import junit.framework.TestCase;
 
-/**
- * Test @{link TextFormatParseInfoTree}.
- */
+/** Test @{link TextFormatParseInfoTree}. */
 public class TextFormatParseInfoTreeTest extends TestCase {
 
   private static final Descriptor DESCRIPTOR = TestAllTypes.getDescriptor();
@@ -75,7 +72,7 @@ public class TextFormatParseInfoTreeTest extends TestCase {
     TextFormatParseInfoTree root = rootBuilder.build();
     assertEquals(LOC0, root.getLocation(OPTIONAL_INT32, 0));
     assertEquals(1, root.getLocations(OPTIONAL_INT32).size());
-    }
+  }
 
   public void testGetLocationsReturnsNoParseLocationsForUnknownField() {
     assertTrue(rootBuilder.build().getLocations(OPTIONAL_INT32).isEmpty());