Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
similarity index 97% |
rename from third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
index a92ba374a6c1ea4acd5fde2c609cf0cce90c5ac2..b7eaebf5e28fbac9a88ac9562157144e9c1abbbd 100644 |
--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java |
@@ -41,7 +41,7 @@ package com.google.protobuf; |
*/ |
public class ForceFieldBuildersPreRun implements Runnable { |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void run() { |
GeneratedMessage.enableAlwaysUseFieldBuildersForTesting(); |
} |