aboutsummaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2016-04-30 20:36:00 -0700
committerJisi Liu <liujisi@google.com>2016-04-30 20:36:00 -0700
commit09f1757cf55236f14ab5cc23cf36ec802860744f (patch)
tree1b0d0c75d22a62302fc5bf4cad61b739b2029957 /BUILD
parentaed7b345fa7a6e54b76773a987dc5a31f88a0342 (diff)
parente0df23ac1483dcc68d2429c804aeba0508714892 (diff)
downloadprotobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.tar.gz
protobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.tar.bz2
protobuf-09f1757cf55236f14ab5cc23cf36ec802860744f.zip
Merge pull request #1467 from pherl/master
Merge Google internal changes
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/BUILD b/BUILD
index ab147e5c..8b1046b9 100644
--- a/BUILD
+++ b/BUILD
@@ -464,8 +464,8 @@ cc_test(
"src/google/protobuf/message_unittest.cc",
"src/google/protobuf/no_field_presence_test.cc",
"src/google/protobuf/preserve_unknown_enum_test.cc",
- "src/google/protobuf/proto3_arena_unittest.cc",
"src/google/protobuf/proto3_arena_lite_unittest.cc",
+ "src/google/protobuf/proto3_arena_unittest.cc",
"src/google/protobuf/proto3_lite_unittest.cc",
"src/google/protobuf/reflection_ops_unittest.cc",
"src/google/protobuf/repeated_field_reflection_unittest.cc",