Undo the Java module change for integration.

Browse source

Moving the files to their original location, so that opensource changes
can be picked during the internal merge. Those files will be moved into
the correct location after merging with internal code.

Note: do NOT merge this into master without the other internal
down-integration commit.

...

This commit is contained in:

Jisi Liu 2016-01-28 13:33:04 -08:00

parent b13874d59e

commit cb3f428810

141 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

0

java/core/src/main/java/com/google/protobuf/AbstractMessage.java → java/src/main/java/com/google/protobuf/AbstractMessage.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java → java/src/main/java/com/google/protobuf/AbstractMessageLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/AbstractParser.java → java/src/main/java/com/google/protobuf/AbstractParser.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java → java/src/main/java/com/google/protobuf/AbstractProtobufList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java → java/src/main/java/com/google/protobuf/BlockingRpcChannel.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/BlockingService.java → java/src/main/java/com/google/protobuf/BlockingService.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/BooleanArrayList.java → java/src/main/java/com/google/protobuf/BooleanArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/BoundedByteString.java → java/src/main/java/com/google/protobuf/BoundedByteString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ByteString.java → java/src/main/java/com/google/protobuf/ByteString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/CodedInputStream.java → java/src/main/java/com/google/protobuf/CodedInputStream.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/CodedOutputStream.java → java/src/main/java/com/google/protobuf/CodedOutputStream.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Descriptors.java → java/src/main/java/com/google/protobuf/Descriptors.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/DoubleArrayList.java → java/src/main/java/com/google/protobuf/DoubleArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/DynamicMessage.java → java/src/main/java/com/google/protobuf/DynamicMessage.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Extension.java → java/src/main/java/com/google/protobuf/Extension.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ExtensionLite.java → java/src/main/java/com/google/protobuf/ExtensionLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java → java/src/main/java/com/google/protobuf/ExtensionRegistry.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java → java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/FieldSet.java → java/src/main/java/com/google/protobuf/FieldSet.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/FloatArrayList.java → java/src/main/java/com/google/protobuf/FloatArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/GeneratedMessage.java → java/src/main/java/com/google/protobuf/GeneratedMessage.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java → java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/IntArrayList.java → java/src/main/java/com/google/protobuf/IntArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Internal.java → java/src/main/java/com/google/protobuf/Internal.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java → java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LazyField.java → java/src/main/java/com/google/protobuf/LazyField.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LazyFieldLite.java → java/src/main/java/com/google/protobuf/LazyFieldLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java → java/src/main/java/com/google/protobuf/LazyStringArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LazyStringList.java → java/src/main/java/com/google/protobuf/LazyStringList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LiteralByteString.java → java/src/main/java/com/google/protobuf/LiteralByteString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/LongArrayList.java → java/src/main/java/com/google/protobuf/LongArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MapEntry.java → java/src/main/java/com/google/protobuf/MapEntry.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MapEntryLite.java → java/src/main/java/com/google/protobuf/MapEntryLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MapField.java → java/src/main/java/com/google/protobuf/MapField.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MapFieldLite.java → java/src/main/java/com/google/protobuf/MapFieldLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Message.java → java/src/main/java/com/google/protobuf/Message.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MessageLite.java → java/src/main/java/com/google/protobuf/MessageLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java → java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MessageLiteToString.java → java/src/main/java/com/google/protobuf/MessageLiteToString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java → java/src/main/java/com/google/protobuf/MessageOrBuilder.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MessageReflection.java → java/src/main/java/com/google/protobuf/MessageReflection.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/MutabilityOracle.java → java/src/main/java/com/google/protobuf/MutabilityOracle.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/NioByteString.java → java/src/main/java/com/google/protobuf/NioByteString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Parser.java → java/src/main/java/com/google/protobuf/Parser.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java → java/src/main/java/com/google/protobuf/ProtobufArrayList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java → java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ProtocolStringList.java → java/src/main/java/com/google/protobuf/ProtocolStringList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java → java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RopeByteString.java → java/src/main/java/com/google/protobuf/RopeByteString.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RpcCallback.java → java/src/main/java/com/google/protobuf/RpcCallback.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RpcChannel.java → java/src/main/java/com/google/protobuf/RpcChannel.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RpcController.java → java/src/main/java/com/google/protobuf/RpcController.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/RpcUtil.java → java/src/main/java/com/google/protobuf/RpcUtil.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Service.java → java/src/main/java/com/google/protobuf/Service.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/ServiceException.java → java/src/main/java/com/google/protobuf/ServiceException.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java → java/src/main/java/com/google/protobuf/SingleFieldBuilder.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/SmallSortedMap.java → java/src/main/java/com/google/protobuf/SmallSortedMap.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/TextFormat.java → java/src/main/java/com/google/protobuf/TextFormat.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java → java/src/main/java/com/google/protobuf/TextFormatEscaper.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java → java/src/main/java/com/google/protobuf/UninitializedMessageException.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java → java/src/main/java/com/google/protobuf/UnknownFieldSet.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java → java/src/main/java/com/google/protobuf/UnknownFieldSetLite.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java → java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/UnsafeByteStrings.java → java/src/main/java/com/google/protobuf/UnsafeByteStrings.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/Utf8.java → java/src/main/java/com/google/protobuf/Utf8.java

Unescape Escape View file

0

java/core/src/main/java/com/google/protobuf/WireFormat.java → java/src/main/java/com/google/protobuf/WireFormat.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java → java/src/test/java/com/google/protobuf/AbstractMessageTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/AnyTest.java → java/src/test/java/com/google/protobuf/AnyTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java → java/src/test/java/com/google/protobuf/BooleanArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java → java/src/test/java/com/google/protobuf/BoundedByteStringTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/ByteStringTest.java → java/src/test/java/com/google/protobuf/ByteStringTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java → java/src/test/java/com/google/protobuf/CheckUtf8Test.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java → java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java → java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java → java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/DescriptorsTest.java → java/src/test/java/com/google/protobuf/DescriptorsTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java → java/src/test/java/com/google/protobuf/DoubleArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java → java/src/test/java/com/google/protobuf/DynamicMessageTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java → java/src/test/java/com/google/protobuf/FieldPresenceTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java → java/src/test/java/com/google/protobuf/FloatArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java → java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java → java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/IntArrayListTest.java → java/src/test/java/com/google/protobuf/IntArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java → java/src/test/java/com/google/protobuf/IsValidUtf8Test.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java → java/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java → java/src/test/java/com/google/protobuf/LazyFieldLiteTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LazyFieldTest.java → java/src/test/java/com/google/protobuf/LazyFieldTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java → java/src/test/java/com/google/protobuf/LazyMessageLiteTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java → java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java → java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java → java/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LiteTest.java → java/src/test/java/com/google/protobuf/LiteTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java → java/src/test/java/com/google/protobuf/LiteralByteStringTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/LongArrayListTest.java → java/src/test/java/com/google/protobuf/LongArrayListTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java → java/src/test/java/com/google/protobuf/MapForProto2LiteTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/MapForProto2Test.java → java/src/test/java/com/google/protobuf/MapForProto2Test.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/MapTest.java → java/src/test/java/com/google/protobuf/MapTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/MessageTest.java → java/src/test/java/com/google/protobuf/MessageTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java → java/src/test/java/com/google/protobuf/NestedBuildersTest.java

Unescape Escape View file

0

java/core/src/test/java/com/google/protobuf/NioByteStringTest.java → java/src/test/java/com/google/protobuf/NioByteStringTest.java

Unescape Escape View file

Some files were not shown because too many files have changed in this diff Show more