• Home
  • History
  • Annotate
  • only in /external/chromium_org/third_party/protobuf/
History log of /external/chromium_org/third_party/protobuf/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
rotobuf_full_do_not_use.host.darwin-mips64.mk
rotobuf_full_do_not_use.host.linux-mips64.mk
rotobuf_lite.target.darwin-mips64.mk
rotobuf_lite.target.linux-mips64.mk
rotoc.host.darwin-mips64.mk
rotoc.host.linux-mips64.mk
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
EADME.chromium
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
roto_library.gni
rotobuf.gyp
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotobuf_lite_java_descriptor_proto.py
rotobuf_lite_java_parse_pom.py
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/platform_macros.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
UILD.gn
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EADME.chromium
roto_library.gni
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
rc/google/protobuf/descriptor.cc
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
roto_library.gni
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
UILD.gn
roto_library.gni
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
UILD.gn
onfig.h
roto_library.gni
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-arm64.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
EADME.chromium
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-arm64.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-arm64.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
rc/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
rotobuf_full_do_not_use.host.darwin-arm64.mk
rotobuf_full_do_not_use.host.linux-arm64.mk
rotobuf_lite.target.darwin-arm64.mk
rotobuf_lite.target.linux-arm64.mk
rotoc.host.darwin-arm64.mk
rotoc.host.linux-arm64.mk
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
EADME.chromium
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.darwin-x86_64.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.linux-x86_64.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.darwin-x86_64.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.linux-x86_64.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.darwin-x86_64.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rotoc.host.linux-x86_64.mk
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
EADME.chromium
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_nacl.gyp
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/repeated_field.h
rc/google/protobuf/stubs/atomicops_internals_tsan.h
rc/google/protobuf/stubs/platform_macros.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-x86.mk
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
EADME.chromium
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
EADME.chromium
EADME.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
rotobuf_lite.gypi
ython/google/protobuf/pyext/python-proto2.cc
ython/setup.py
rc/Makefile.am
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_arm_qnx.h
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/stringprintf.h
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite_inl.h
sprojects/extract_includes.bat
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
HANGES.txt
EADME.chromium
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
rotobuf.gyp
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/enum_type_wrapper.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/message_cpp_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_cpp_generated_test.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/pyext/python-proto2.cc
ython/google/protobuf/pyext/python_descriptor.cc
ython/google/protobuf/reflection.py
ython/google/protobuf/text_format.py
ython/setup.py
rc/Makefile.am
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_unittest.h
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_doc_comment.h
rc/google/protobuf/compiler/java/java_doc_comment_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/stl_util.h
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/stringprintf.h
rc/google/protobuf/stubs/stringprintf_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/template_util.h
rc/google/protobuf/stubs/template_util_unittest.cc
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/testdata/text_format_unittest_data.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
sprojects/extract_includes.bat
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
EADME.chromium
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_tsan.h
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
3c54152607de4272b3da0c146b71dcba8a0e5610 28-Jun-2013 Ben Murdoch <benm@google.com> Fixup MIPS makefiles

Change-Id: I9aa2b7e1c2db822880a3f48e308f62979577acd5
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.linux-mips.mk
e31802ad5b5d9fdf7daba665b671e9ecee368cb8 27-Jun-2013 Ben Murdoch <benm@google.com> Fix MIPS makefiles

Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.linux-mips.mk
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-mips.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-mips.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-mips.mk
rotoc.host.linux-x86.mk
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
rotobuf_full_do_not_use.host.darwin-mips.mk
rotobuf_full_do_not_use.host.linux-mips.mk
rotobuf_lite.target.darwin-mips.mk
rotobuf_lite.target.linux-mips.mk
rotoc.host.darwin-mips.mk
rotoc.host.linux-mips.mk
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-x86.mk
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-x86.mk
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
rotobuf.gyp
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
rotobuf_full_do_not_use.host.darwin-arm.mk
rotobuf_full_do_not_use.host.darwin-x86.mk
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_lite.target.darwin-arm.mk
rotobuf_lite.target.darwin-x86.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-x86.mk
rotoc.host.darwin-arm.mk
rotoc.host.darwin-x86.mk
rotoc.host.linux-arm.mk
rotoc.host.linux-x86.mk
rc/google/protobuf/stubs/atomicops.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
EADME.chromium
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
rotobuf.gyp
rotobuf_full_do_not_use.host.linux-arm.mk
rotobuf_full_do_not_use.host.linux-x86.mk
rotobuf_full_do_not_use.host.mk
rotobuf_lite.gypi
rotobuf_lite.host.mk
rotobuf_lite.target.linux-arm.mk
rotobuf_lite.target.linux-x86.mk
rotobuf_lite.target.mk
rotobuf_lite_java_descriptor_proto.py
rotobuf_lite_java_parse_pom.py
rotoc.host.linux-arm.mk
rotoc.host.linux-x86.mk
rotoc.host.mk
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/extension_set.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/message.cc
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/once.h
rc/google/protobuf/unknown_field_set.cc
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
HANGES.txt
ONTRIBUTORS.txt
OPYING.txt
NSTALL.txt
EADME.chromium
EADME.txt
_init__.py
onfig.h
escriptor_pb2.py
rotobuf.gyp
rotobuf_full_do_not_use.host.mk
rotobuf_lite.host.mk
rotobuf_lite.target.mk
rotoc.host.mk
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/internal/__init__.py
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/message.py
ython/google/protobuf/pyext/python-proto2.cc
ython/google/protobuf/pyext/python_descriptor.cc
ython/google/protobuf/pyext/python_descriptor.h
ython/google/protobuf/pyext/python_protobuf.cc
ython/google/protobuf/pyext/python_protobuf.h
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/service_reflection.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/stubout.py
rc/Makefile.am
rc/google/protobuf/SEBS
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_generator.h
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator.h
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_service.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/package_info.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/compiler/test_plugin.cc
rc/google/protobuf/compiler/zip_output_unittest.sh
rc/google/protobuf/compiler/zip_writer.cc
rc/google/protobuf/compiler/zip_writer.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/gzip_stream_unittest.sh
rc/google/protobuf/io/package_info.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream.h
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/package_info.h
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_arm_gcc.h
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.h
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/structurally_valid_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/substitute.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message
rc/google/protobuf/testdata/golden_packed_fields_message
rc/google/protobuf/testdata/text_format_unittest_data.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/readme.txt