diff options
author | Xiao Hang <rocking@google.com> | 2015-07-29 15:12:10 -0700 |
---|---|---|
committer | Xiao Hang <rocking@google.com> | 2015-08-04 14:30:39 -0700 |
commit | ebcd51ce0f4d85cdfdca7d630f225478efaa8f4a (patch) | |
tree | ff110a2a652a0bf29be8c9edfcb7dec151bfe7c7 /javanano/src/test/java/com/google/protobuf/nano/NanoTest.java | |
parent | 801e92007fd6eac3fa5b4c386ba54089393680c7 (diff) | |
parent | c3e6493aa43241688a307162f3417c176f3c0d4f (diff) |
Merge branch 'master' of https://github.com/zsurocking/protobuf
Diffstat (limited to 'javanano/src/test/java/com/google/protobuf/nano/NanoTest.java')
-rw-r--r-- | javanano/src/test/java/com/google/protobuf/nano/NanoTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java index 87deb00b..debf7c0a 100644 --- a/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java +++ b/javanano/src/test/java/com/google/protobuf/nano/NanoTest.java @@ -30,20 +30,20 @@ package com.google.protobuf.nano; -import com.google.protobuf.nano.MapTestProto.nano.TestMap; +import com.google.protobuf.nano.MapTestProto.TestMap; import com.google.protobuf.nano.CodedOutputByteBufferNano; -import com.google.protobuf.nano.MapTestProto.nano.TestMap.MessageValue; +import com.google.protobuf.nano.MapTestProto.TestMap.MessageValue; import com.google.protobuf.nano.NanoAccessorsOuterClass.TestNanoAccessors; import com.google.protobuf.nano.NanoHasOuterClass.TestAllTypesNanoHas; import com.google.protobuf.nano.NanoOuterClass.TestAllTypesNano; -import com.google.protobuf.nano.UnittestRecursiveNano.nano.RecursiveMessageNano; +import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano; import com.google.protobuf.nano.NanoReferenceTypesCompat; -import com.google.protobuf.nano.UnittestSimpleNano.nano.SimpleMessageNano; -import com.google.protobuf.nano.UnittestSingleNano.nano.SingleMessageNano; -import com.google.protobuf.nano.testext.Extensions; -import com.google.protobuf.nano.testext.Extensions.AnotherMessage; -import com.google.protobuf.nano.testext.Extensions.MessageWithGroup; -import com.google.protobuf.nano.testimport.UnittestImportNano; +import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano; +import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano; +import com.google.protobuf.nano.testext.nano.Extensions; +import com.google.protobuf.nano.testext.nano.Extensions.AnotherMessage; +import com.google.protobuf.nano.testext.nano.Extensions.MessageWithGroup; +import com.google.protobuf.nano.testimport.nano.UnittestImportNano; import junit.framework.TestCase; |