[Pkg-protobuf-devel] [pkg-protobuf] branch upstream updated (dcb4f07 -> f806b15)

Iustin Pop iustin at moszumanska.debian.org
Sun May 8 07:24:22 UTC 2016


This is an automated email from the git hooks/post-receive script.

iustin pushed a change to branch upstream
in repository pkg-protobuf.

      from  dcb4f07   Imported Upstream version 2.6.1
      adds  2853cd4   Add .gitignore file
      adds  f9e623b   Merge changes from 2.6.1 release branch.
      adds  df5481c   Update version number to 2.6.2-pre.
      adds  53d202f   Add the missing solaris atomics header file.
      adds  2ba455f   Corrected code example in coded_stream.h
      adds  98db495   Change references to `vector` to use `std::vector`
      adds  11e6e9a   Merge pull request #72 from Steelskin/master
      adds  918e3ee   Fixed Unused Parameter warning in headers.
      adds  ec71d5d   Fixed Unused Parameter warning in compiler headers.
      adds  3e0ec8d   Merge pull request #70 from AustinSchuh/master
      adds  717f807   Silence -Wsign-compare warning on Mac
      adds  a270576   Merge pull request #71 from abyss7/master
      adds  0fd260e   Use 2to3 when building under Python 3.
      adds  b460610   Omit google-apputils dependency under Python 3
      adds  ad7f41b   Merge pull request #50 from dlitz/compat-py3k
      adds  baca1a8   Adds more checks before deleting temporary files.
      adds  6ef984a   Down-integrate from internal code base.
      adds  c768072   typo fixes - https://github.com/vlajos/misspell_fixer
      adds  643d09a   Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
      adds  4eaa16f   Fixed IBM xlC compiler error due to missing prefix.
      adds  ebb4198   Add atomicops for AIX/POWER + IBM xlC compiler.
      adds  1ddf693   Added contributor and updated README to add AIX.
      adds  af88ccb   Modify tests to compile on AIX with xlC compiler.
      adds  faf581d   Merge pull request #69 from apaprocki/aix-atomicops
      adds  e8e3a5b   Compat w/ git < 1.8.
      adds  706690b   Ignore generated test scaffolding files.
      adds  38a3dd5   Exclude Python build artifacts.
      adds  f157a56   Down-integrate from internal code base (C++ maps support).
      adds  83671c0   Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
      adds  8b2aafe   Use 'kint32min'/'kint32max' constants, rather than defining locally.
      adds  53c1029   Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN
      adds  113eb61   Avoid '**/' patterns for compat w/ git < 1.8.
      adds  e4f063f   Merge pull request #86 from tseaver/compat_w_git_lt_1.8
      adds  0eb7476   Merge remote-tracking branch 'upstream/master'
      adds  0fab060   Fix 'error: a class-key must be used when declaring a friend' compile error.
      adds  4113685   Fix testcase compile failure under gcc 4.6:
      adds  db90dff   Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend
      adds  e9d18bc   Ignore files generated from new 'map*.protobuf' sources.
      adds  6a51460   Merge pull request #89 from tseaver/ignore-map_generated_files
      adds  9ae3b0b   Update LICENSE to list files that aren't copyrighted by Google Inc.
      adds  8a87fb8   Merge pull request #79 from xfxyjwf/license
      adds  35be73b   Initial Contribution
      adds  f83a870   auto import from //branches/cupcake/... at 130745
      adds  52067f6   auto import from //branches/cupcake/... at 132276
      adds  bb7bbd7   auto import from //depot/cupcake/@137055
      adds  a3cc5f1   auto import from //depot/cupcake/@132589
      adds  778b51c   auto import from //depot/cupcake/@135843
      adds  82155ac   auto import from //depot/cupcake/@135843
      adds  d7af73c   Merge commit 'remotes/korg/cupcake' into merge
      adds  5a08423   auto import from //branches/cupcake_rel/... at 140373
      adds  091ddea   Merge commit 'korg/cupcake'
      adds  42a1a58   Merge branch 'open_source_no_contributions' into google_internal
      adds  2bf2b97   Merge donut into master
      adds  babfb77   ProtoBuf update  * Added IntMap that uses Hashtable for larger keys  * Chagned to use IntMap to allow larger tags  * Changed to use autoboxing for int/longs.
      adds  53a2e9d   am 9aaf5076: ProtoBuf update  * Added IntMap that uses Hashtable for larger keys  * Chagned to use IntMap to allow larger tags  * Changed to use autoboxing for int/longs.
      adds  7e013ca   Revert "ProtoBuf update"
      adds  8a3fd81   am 7fea449b: Revert "ProtoBuf update"
      adds  c1a443d   Adds a few utilities to ProtoBufUtil, integrating over from mainline
      adds  9ed5ba9   am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from mainline
      adds  e68c309   Merge korg/donut into korg/master
      adds  0422db3   reconcile korg/master into goog/master
      adds  95dbaa6   The j2me protobuf code is now in vendor/google; remove it here.
      adds  3599164   reconcile android-2.1_r1 snapshot
      adds  b9ebfe9   reconcile main tree with open-source eclair
      adds  3ac755c   am 96ccdc22: reconcile main tree with open-source eclair
      adds  f9e5cc7   The Android specific files prior to adding protobuf 2.2.0a sources.
      adds  3df2fda   Add protobuf 2.2.0a sources
      adds  e5566f8   Add support for Java micro protobuf's to protobuf-2.2.0a.
      adds  5ab6e29   Add protobuf 2.3.0 sources
      adds  ce7a2b0   Add support for Java micro protobuf's to protobuf-2.3.0.
      adds  acf8ef1   Add libprotobuf-cpp-2.3.0-lite
      adds  c778cad   Merge "Add libprotobuf-cpp-2.3.0-lite"
      adds  c033363   Skip stlport for simulator
      adds  e9da248   Add libprotobuf-java-2.3.0-lite.
      adds  00302c1   Changed speed optimization for strings.
      adds  7d0a2a3   Add libprotobuf-cpp-2.3.0-full.
      adds  aa67764   Make protobuf usable by host-side java apps
      adds  6ebe230   Make these modules optional.
      adds  ee613fa   merge from gingerbread
      adds  b164b01   Remove vestigial references to StringUtf8Micro.
      adds  69004c5   am 3574de1c: Remove vestigial references to StringUtf8Micro.
      adds  f5bc288   Build the protocol buffer compiler 'protoc'.
      adds  4e79aac   Rename protoc to aprotoc.
      adds  ddf7406   Unbundle protobuffer target libraries.
      adds  3b3e5e5   Unbundle protobuffer target libraries.
      adds  d4bdc4c   am 7cc5f59e: Unbundle protobuffer target libraries.
      adds  17892bc   Remove the simulator target from all makefiles. Bug: 5010576
      adds  4747b03   Build the target protobuf libraries against the NDK
      adds  6422722   Retire LOCAL_NDK_VERSION.
      adds  b74eb3f   Retire LOCAL_NDK_VERSION.
      adds  ce12c0a   am a6d94785: Retire LOCAL_NDK_VERSION.
      adds  b67a8ec   Build against the NDK for x86 and mips too.
      adds  610c2fd   Add gnustl+rtti version of cpp full library
      adds  c991c16   Build against the NDK for x86 and mips too.
      adds  c4e73a8   am db9ab02c: (-s ours) Build against the NDK for x86 and mips too.
      adds  2337023   Nano protobufs.
      adds  64a8421   Merge "Nano protobufs."
      adds  08b6e50   am 216c9e86: Merge "Nano protobufs."
      adds  d6592c7   Nano protobufs.
      adds  86ce471   am 43325653: Nano protobufs.
      adds  741f208   Prevent conflicts between local and proto variable names.
      adds  4380449   am fb8f78fe: Prevent conflicts between local and proto variable names.
      adds  3234cee   Prevent conflicts between local and proto variable names.
      adds  d4bb580   Merge "Prevent conflicts between local and proto variable names."
      adds  12ac3a7   am a6b79eb9: Merge "Prevent conflicts between local and proto variable names."
      adds  314a302   Don't use Arrays.copyOf in generated code.
      adds  4349e11   Merge "Don't use Arrays.copyOf in generated code."
      adds  fbbe842   am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code."
      adds  adf9518   Fix typos in protobuf readme.
      adds  bb9b490   Merge "Fix typos in protobuf readme."
      adds  16ab196   am d29f87c7: Merge "Fix typos in protobuf readme."
      adds  2967875   Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true.
      adds  b0874cc   Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
      adds  1fa7217   am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
      adds  a161215   Add toString() method to MessageNano.
      adds  63d4b5f   Merge "Add toString() method to MessageNano."
      adds  5f49284   am 6f59b383: Merge "Add toString() method to MessageNano."
      adds  a220fe6   Fix enum field references with java_multiple_files.
      adds  661f87c   Merge "Fix enum field references with java_multiple_files."
      adds  ad58052   am 9459b5c4: Merge "Fix enum field references with java_multiple_files."
      adds  5659cca   Nano support for extensions and unknown fields.
      adds  499f47f   Merge "Nano support for extensions and unknown fields."
      adds  50acfda   am 0a1429cc: Merge "Nano support for extensions and unknown fields."
      adds  cb1a5d1   am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fields."
      adds  ee011ab   am 728a8b78: Merge "Fix the build"
      adds  a3382b2   am 08891725: am 728a8b78: Merge "Fix the build"
      adds  51f5dcf   am eda87c5c: Merge "Fix vanilla make build."
      adds  7c80ff1   am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."
      adds  a9c4e08   Make it possible to use MessageNano.mergeFrom without casting.
      adds  b8f5dad   Merge "Make it possible to use MessageNano.mergeFrom without casting."
      adds  ba74aab   am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."
      adds  ff76a10   am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."
      adds  d4bb971   Update nano to serialize java keywords properly.
      adds  8659502   Merge "Update nano to serialize java keywords properly."
      adds  12d1e72   am aad4b307: Merge "Update nano to serialize java keywords properly."
      adds  fc73d07   am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords properly."
      adds  39799d0   Add contribution instructions for nano.
      adds  c01060c   Merge "Add contribution instructions for nano."
      adds  521d472   am a400007e: Merge "Add contribution instructions for nano."
      adds  87d51d0   am f604f71a: am a400007e: Merge "Add contribution instructions for nano."
      adds  d98e9c4   Allow NaN/+inf/-inf defaults in micro/nano.
      adds  49e4bdc   Merge "Allow NaN/+inf/-inf defaults in micro/nano."
      adds  0940015   am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."
      adds  0d02681   am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."
      adds  4c4d639   Per-file java_multiple_files flag.
      adds  fffc5f3   Merge "Per-file java_multiple_files flag."
      adds  f45ac2d   am ac5a239e: Merge "Per-file java_multiple_files flag."
      adds  2000cfd   Add test for passing in proto params.
      adds  a91e2fc   Merge "Add test for passing in proto params."
      adds  09d1295   am 021f8f1b: Merge "Add test for passing in proto params."
      adds  e83bbbb   Add an option to inspect "has" state upon parse.
      adds  064b60c   Merge "Add an option to inspect "has" state upon parse."
      adds  eebef83   am be47f55e: Merge "Add an option to inspect "has" state upon parse."
      adds  1c277f9   Fixed packed repeated serialization.
      adds  cebd784   Merge "Fixed packed repeated serialization."
      adds  bc1543f   am 87c8e31b: Merge "Fixed packed repeated serialization."
      adds  06eed37   Fix outer classname for javamicro/javanano.
      adds  062d561   Merge "Fix outer classname for javamicro/javanano."
      adds  5835efa   am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  473985e   Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
      adds  e433443   Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  96cb692   am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  c1c1e41   am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  3812e8f   am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  171633d   am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  54e88ad   am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  1c546a5   Merge commit '11c3b27d' into fix-mc
      adds  1500d91   am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  7176612   Add two codegen parameters to nano.
      adds  698f28a   Merge "Add two codegen parameters to nano."
      adds  19eb6da   am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  e527ce9   am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  ee4410d   Add some bitfield helper methods from 2.4
      adds  7194f66   Merge "Add some bitfield helper methods from 2.4"
      adds  f64af91   am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  cfc0c4b   am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  b337f25   Accessor style for optional fields.
      adds  9342947   Merge "Accessor style for optional fields."
      adds  46f28af   am 0d035e9b: Merge "Accessor style for optional fields."
      adds  2de4fd9   am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  1479c7a   Implement enum_style=java option.
      adds  4b7983c   Merge "Implement enum_style=java option."
      adds  2775727   am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  1cf2dbb   am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  b3c24e0   Fix roundtrip failure with groups when unknown fields are enabled.
      adds  e7336cd   Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  ba1b8ba   am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  e9daaf8   am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  0b86e55   Fix some indenting issues with set__() function
      adds  1410c72   Merge "Fix some indenting issues with set__() function"
      adds  19e465d   am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  f7cfc52   am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  10107cb   Add reftypes field generator option.
      adds  2b51f83   Merge "Add reftypes field generator option."
      adds  15d23f9   am c4a1b547: Merge "Add reftypes field generator option."
      adds  379ebed   am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  8c65bb7   Add missing README parts for enum_style and in-repo usage
      adds  3289fe1   Merge "Add missing README parts for enum_style and in-repo usage"
      adds  941bc6e   am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  3dc9207   am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  0652d70   Remove all field initializers and let ctor call clear().
      adds  f188683   Merge "Remove all field initializers and let ctor call clear()."
      adds  a142dc2   am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  1f020a3   am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  39b3008   Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomerge
      adds  bb2a648   am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  3394ad2   am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  34547de   Protect against null repeated fields.
      adds  80dcae7   Merge "Protect against null repeated fields."
      adds  6beadab   am 63e819ad: Merge "Protect against null repeated fields."
      adds  ddd2ed6   am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  cd3c68b   Fix repeated field merging semantics.
      adds  665d99f   Merge "Fix repeated field merging semantics."
      adds  9d3016b   am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  64d9375   am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  9a93c5f   Make generated code more aligned with Google Java style.
      adds  1004093   Merge "Make generated code more aligned with Google Java style."
      adds  e69fae7   am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  197ad4f   am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  fba329d   Feature request: set() and clear() accessors return this
      adds  461d4ac   Merge "Feature request: set() and clear() accessors return this"
      adds  6404b4f   am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  698e119   am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  56a3732   Implement hashCode() and equals() behind a generator option.
      adds  885f959   Merge "Implement hashCode() and equals() behind a generator option."
      adds  500fbc5   am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  bfa0c6b   am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  3f0c348   Allow for ref-type arrays containing null elements.
      adds  874d66c   Merge "Allow for ref-type arrays containing null elements."
      adds  a2b2790   am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  78fd829   am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  28b4dec   Minimize method count for nanoproto.
      adds  335140f   Merge "Minimize method count for nanoproto."
      adds  1bca0c0   am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  0f00678   am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  eee1dd7   Fix warnings warnings in header files, hide others.
      adds  558af24   Merge "Fix warnings warnings in header files, hide others."
      adds  52b74c5   am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  d314891   am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  904c81e   Update MessageNano#toString() to return mostly valid TextFormat.
      adds  190edd7   Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  5bafef2   am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  817695d   am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  adf2449   Align with main: two ways of parsing repeated packable fields.
      adds  7c6ab9a   Merge "Align with main: two ways of parsing repeated packable fields."
      adds  ee95314   am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  0f5e3fc   am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  2d2557e   Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD
      adds  d5d8527   am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  8e2e935   am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  cb64a63   Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD
      adds  f5b6959   am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  c19d928   am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  c997c13   Nano: don't generate accessor methods for nested methods
      adds  482bf52   Merge "Nano: don't generate accessor methods for nested methods"
      adds  59e39cd   am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  80e50ae   am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  04feb76   Avoid class initializers to help ProGuard.
      adds  b3bc609   Merge "Avoid class initializers to help ProGuard."
      adds  75c5216   am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  56c47ec   am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  02a9ea0   Fix MessageNanoPrinter for accessors
      adds  0c0f8c7   Merge "Fix MessageNanoPrinter for accessors"
      adds  8af6273   am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  76252d7   am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  1b1735c   Don't serialize required fields whose 'has' flags are unset.
      adds  2fb3cdf   Merge "Don't serialize required fields whose 'has' flags are unset."
      adds  eeda36e   am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  4d58373   am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  79b311c   Correctness: floating point equality using bits instead of ==.
      adds  0eecf0b   Merge "Correctness: floating point equality using bits instead of ==."
      adds  d44a519   am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  7057fa5   am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  bc8eec3   Allow whitespace in nano codegen options.
      adds  a793c09   Merge "Allow whitespace in nano codegen options."
      adds  14ae563   am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  7a83099   am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  e005be6   Add validation when parsing enum fields.
      adds  74959d4   Fix repeated packed field merging code for non-packed data.
      adds  a2d72a5   Merge changes I9fecff3c,I2c1eb07f
      adds  6d7dfd3   am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  cddcfea   am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  e3714f0   Extension overhaul.
      adds  3a21092   Merge "Extension overhaul."
      adds  0ad269e   am afc1553a: Merge "Extension overhaul."
      adds  841521c   am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  a9c3868   am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  b99eb7f   am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  5090f19   Don't reset cachedSize to 0 in getSerializedSize
      adds  ddc98d6   Merge "Don't reset cachedSize to 0 in getSerializedSize"
      adds  d76d44f   am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  cf7ff1a   am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  546ed9a   Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  b7dd7d9   Revert "Don't reset cachedSize to 0 in getSerializedSize"
      adds  dc2ab87   Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
      adds  1e92850   am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  68f721b   am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  598087e   Don't reset cachedSize to 0 in getSerializedSize
      adds  56cba8e   Merge "Don't reset cachedSize to 0 in getSerializedSize"
      adds  09f640e   am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  a4b3e9d   am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  d9425a6   Adds --ignore_service nano proto compiler flag
      adds  f101953   Merge "Adds --ignore_service nano proto compiler flag"
      adds  5cc8a31   am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  e278b64   am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  ec4b1ce   Support generation of Parcelable nano messages.
      adds  a2724e7   Merge "Support generation of Parcelable nano messages."
      adds  3eafa87   am 33a6680a: Merge "Support generation of Parcelable nano messages."
      adds  46bf926   resolved conflicts for merge of 592b6078 to master
      adds  b97d258   am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  e73c4a0   am afc1553a: Merge "Extension overhaul."
      adds  66ec7d4   am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  9d89464   am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  6ba01e2   am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  af802cd   Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
      adds  12214c5   am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  05b6a7b   am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  b24fdd4   Fix NPE when clearing an extension in nano protos
      adds  4aecb2b   Merge "Fix NPE when clearing an extension in nano protos"
      adds  3e46c9b   am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  0012091   am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  42470ba   am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  d750270   You CANNOT change the global WITH_DEXPREOPT
      adds  b54018a   Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  70ef74a   am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  efd4ae4   am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  e251c9e   am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  5a2be75   am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  583ccca   am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  5534ced   am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  94d87e4   am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  990a475   am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  648917d   am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  fb594ee   am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  e478ddd   am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  5486adb   am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  1a4e9aa   am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  51d87cc   am 380d1b5a: Fix the merge conflict leftovers.
      adds  3d365c9   am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
      adds  1724ed4   am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  9912829   am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  1eb488b   am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  0d7bc44   am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  80e4a34   am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  4202251   am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  9865277   am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  dee998a   am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  d8e4681   am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  e7eb156   am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  2e58634   am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  9d4ef46   am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  34d6051   am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  7a29ad7   am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  5b799a2   am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  dbe4eda   am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  1274ae6   am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  4091687   am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  7da3e75   am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  92ee2f0   am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  751cfd0   am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  a6d2dea   am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  525810e   am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  5377fe8   am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  11e2bf3   am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  407a507   am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  bd636ae   am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  ca3ee37   am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  493ac5b   am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  a4d6044   am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  aff0edc   am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  c1ebdc5   am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  16d339f   am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  f0b0553   am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  1161744   am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  44fb048   am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  8e76827   am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  07777ed   am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  eb3871b   am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  16890a2   am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  689ea73   am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  f87af75   am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  69576a3   am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  65403dd   am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  96d4c1c   am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  4d5b685   am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  5e2d55d   am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  3966be9   am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  8961fc0   am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  ec730f9   am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  6ceb306   am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  6a64e5f   am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  78544a3   am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  1f0c9cd   am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  e323701   am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  89197d0   am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  9f4dda6   resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
      adds  1e6f980   am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
      adds  4def4b4   am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  83ed21f   am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  915cdda   am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  42c481a   am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  e4f1a34   am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  bf2bb67   am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  63bb189   am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  f812e7f   am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  2666d4d   Merge commit 'e887563a' into fix-merge-conclict
      adds  642f700   Merge commit 'f65ee555' into fix-merge-conflict
      adds  b05e2ff   am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  b67c3fa   am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  78e5e83   am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  8624f47   am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  ba0ea95   am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  8b6445a   am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  a3d1a03   am 8113c186: resolved conflicts for merge of 592b6078 to master
      adds  be8aadf   am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
      adds  e76c2ce   am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  ef5fd0e   am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  9ad944e   am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  9a58c6f   am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  3b0952f   Revert "Merge commit 'e887563a' into fix-merge-conclict"
      adds  fadc110   Revert "Merge commit 'e887563a' into fix-merge-conclict"
      adds  d9b892d   Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
      adds  9db6d43   am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
      adds  1d50c6b   reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
      adds  709cb73   keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  f5759da   am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  c7213e1   am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  82461de   You CANNOT change the global WITH_DEXPREOPT
      adds  b18d5c1   am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
      adds  30cd2a4   am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
      adds  79f19eb   Keep pointers to extension values.
      adds  30b1454   Merge "Keep pointers to extension values."
      adds  9c2d63c   am daf63839: Merge "Keep pointers to extension values."
      adds  d1a8a8f   Fix access around unknownFieldData.
      adds  7a83d34   Merge "Fix access around unknownFieldData."
      adds  2e91cf4   am a88808d4: Merge "Fix access around unknownFieldData."
      adds  c052b50   Add a hasExtension method to ExtendableMessageNano.
      adds  2a5f3f9   Merge "Add a hasExtension method to ExtendableMessageNano."
      adds  a481ed8   am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."
      adds  7acc0f8   Don't return NULL from {Boxed}PrimitiveTypeName.
      adds  23c5978   Merge "Don't return NULL from {Boxed}PrimitiveTypeName."
      adds  c390fe3   am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
      adds  b596f9c   Fix the aprotoc target for Windows.
      adds  a174231   Merge "Fix the aprotoc target for Windows."
      adds  985cc6a   am 4d11e705: Merge "Fix the aprotoc target for Windows."
      adds  333c46c   Fix build, by using external/zlib instead of system zlib
      adds  33824b0   am f91b7fa1: Fix build, by using external/zlib instead of system zlib
      adds  9ceb3d4   Fix how getRepeatedFieldArrayLength works
      adds  ec0e1c0   Merge "Fix how getRepeatedFieldArrayLength works"
      adds  4be139d   am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
      adds  c891123   am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  5c53e89   am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  0f91148   am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
      adds  e8e5707   am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  c5a596d   am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  052abee   am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  b5c235c   am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  28448e6   am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  07c34fa   am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  feac014   am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  f3223cd   am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  bf6b7cb   am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
      adds  6e81fbb   am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  9d07847   am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  64b1c77   am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
      adds  50b3423   am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  40a85d0   am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  628e245   am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
      adds  87f4899   am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
      adds  a4a0dbf   am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
      adds  4d0809c   am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
      adds  9bb773f   am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  6ea7791   am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  c76c467   am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
      adds  f3e1090   am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  a321b31   am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  e136840   am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
      adds  a96e4fd   am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  c6db485   am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  e984f5a   am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
      adds  603d3f5   am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  14db565   am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  4adac19   am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
      adds  e24507d   am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  7b7373e   am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  7d207bb   am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
      adds  f5392a8   am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  47a794d   am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  72d1e4c   am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
      adds  357f6b7   am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  0f1f872   am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  6172b92   am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
      adds  e0dbffd   am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  53ee7a0   am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  6173389   am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
      adds  5f851e7   am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  80ac912   am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  106ab9f   am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
      adds  bfe3289   am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  1eda7ff   am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  b4948d7   am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
      adds  4578616   am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  ee9e51a   am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  dfa03c1   am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
      adds  5120d06   am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  ee90593   am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  789d9b9   am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
      adds  dd1856e   am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  894827d   am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  15167d6   am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
      adds  9360e76   am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  d86fe31   am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  c032a15   am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
      adds  a4193fb   am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  3e2d499   am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  09592e0   am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
      adds  d582abf   am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  22ba1f6   am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  31e0909   am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
      adds  811349a   am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  caf14f7   am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  d997452   am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
      adds  caa8cd3   am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  e0f145b   am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  2e93315   am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
      adds  ed3f38f   am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  c5e9367   am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  aa50da3   am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
      adds  aad7f1d   am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  b1ba6ff   am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  578b455   am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
      adds  432b1b5   am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  30b7da3   am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  2719e4a   am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
      adds  3942858   am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  73de4c5   am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  9781799   am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
      adds  3e9233a   am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  5ae7d25   am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  8d8cd5d   am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
      adds  b930355   am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  44feae0   am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  1a6e5f2   am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
      adds  7f1f309   am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  29513c5   am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  f83fdc9   am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
      adds  2b50c9f   am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  97c00d3   am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  34c6031   am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
      adds  f5ef0e6   am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  e4ee5ca   am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  a8176e2   am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
      adds  9d16f8a   am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  3811367   am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  d887adc   am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
      adds  4f8d54c   am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
      adds  ea45d54   am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
      adds  8c05028   am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
      adds  b331a49   am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  a51cbaf   am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  4bc9f97   am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
      adds  d0c2375   am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  fe0c21e   am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  88c2ee3   am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
      adds  ffc8f5f   am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  681a96f   am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  6cb2f95   am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
      adds  33a80f2   am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  5cf6a25   am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  2952088   am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  6016650   am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
      adds  cb06adc   am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
      adds  9378b71   am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
      adds  5e3937e   am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  74848a3   am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  fce0ffd   am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
      adds  1778b67   am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  2e66ca8   am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  2e738aa   am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
      adds  748d761   am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  3b59229   am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  6745fbb   am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
      adds  b04e9a7   am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
      adds  87e6efa   am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
      adds  d777ada   am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
      adds  eb0cd10   am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  3b3f9c9   am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  c1a565c   am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
      adds  2e8a9c7   am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  693df0c   am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  c430d41   am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
      adds  0554e65   am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
      adds  8836d12   am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
      adds  df60b25   am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
      adds  39c59c2   am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
      adds  58ed7e4   am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
      adds  944f597   am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
      adds  e083bdf   am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  3d5bce5   am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  c64af59   am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
      adds  6a4c81a   am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
      adds  11985d9   am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
      adds  08dd604   am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
      adds  a476440   am f39998c2: am daf63839: Merge "Keep pointers to extension values."
      adds  e57ee76   am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
      adds  1dad0f2   am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
      adds  3462382   am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
      adds  dd49d0a   am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
      adds  274705a   am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
      adds  32a45d0   Fixed octal printing of bytearrays
      adds  04f70ef   Merge "Fixed octal printing of bytearrays"
      adds  a609653   am 238e0ac5: Merge "Fixed octal printing of bytearrays"
      adds  42da25e   Revert "Fixed octal printing of bytearrays"
      adds  2b69e07   Merge "Revert "Fixed octal printing of bytearrays""
      adds  be60c85   am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
      adds  2d60e10   Fixed octal printing of bytearrays
      adds  9d9cb7c   Merge "Fixed octal printing of bytearrays"
      adds  8024168   am 0068978c: Merge "Fixed octal printing of bytearrays"
      adds  72881da   Add MessageNano.messageNanoEquals().
      adds  553d39f   Merge "Add MessageNano.messageNanoEquals()."
      adds  5db346f   am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."
      adds  5a9b450   Make the tag field public.
      adds  e1458bb   Merge "Make the tag field public."
      adds  6c82acd   am c4e7b92f: Merge "Make the tag field public."
      adds  87bd402   Includes a MessageNano subclass's name's hashCode in hashCode calculations.
      adds  14e2f6c   Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations."
      adds  7d8185c   am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."
      adds  a892068   Adds a primitive enum mode for reftypes.
      adds  517591b   Merge "Adds a primitive enum mode for reftypes."
      adds  50a024f   am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."
      adds  7fbf654   Change reftypes_primitive_enums to reftypes_compat_mode.
      adds  188a2d6   Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
      adds  4d6e9c5   am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
      adds  dac0167   Move protobuf 2.3.0 to prebuilts.
      adds  59f2ff5   Merge "Move protobuf 2.3.0 to prebuilts."
      adds  e4e7f3a   am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."
      adds  5d6fc19   Added an API method in FieldData to allow access to the UnknownField data
      adds  0b6a8f7   Merge "Added an API method in FieldData to allow access to the UnknownField data"
      adds  e214da2   am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"
      adds  68e7e78   Add platform versions of the protobuf libraries.
      adds  6dc3924   Merge "Add platform versions of the protobuf libraries."
      adds  cd980d1   Prepare nano proto code to be merged into protobuf repository.
      adds  95c2591   Merge nano proto into protobuf repository.
      adds  9e65d4b   Fix the broken link at the bottom of javanano/README.txt
      adds  aa8ef98   Merge pull request #91 from xfxyjwf/android_nano
      adds  49bc8c0   Add nano proto authors and update LICENSE file to include Android.mk.
      adds  99aa0f9   Down-integrate from internal code base.
      adds  e9bbfbc   Link Java Nano generator into protoc.
      adds  dd449e1   Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
      adds  7f3a25b   Merge pull request #103 from Ang3lus/master
      adds  6ae3bde   Fix issue 99.
      adds  241921c   Merge branch 'master' of github.com:google/protobuf
      adds  7d2db50   Merge pull request #104 from pherl/master
      adds  418ece3   Fix javadoc warnings.
      adds  209840e   Merge pull request #106 from xfxyjwf/fix_62
      adds  90f2f50   Make Java TextFormat.printToUnicodeString() escape newlines.
      adds  c25d9fe   Down-integrate from internal code base.
      adds  e5a1799   Fix typo
      adds  7d4117c   Merge pull request #110 from nsuke/tb-typo-cpp_extension
      adds  33bb176   Add oneof keyword to proto.vim
      adds  bdcdee0   Merge pull request #109 from nsuke/tb-vim-oneof
      adds  5ff8dc8   Make ByteStrings serializable with java serialization.
      adds  a32a1a7   Add tests for other ByteString subclasses
      adds  7f2a9fb   Merge pull request #102 from fizbin/bytestring_serializable
      adds  3eb55df   Report a warning if the proto file doesn't have a syntax statement.
      adds  e559b51   Merge pull request #81 from xfxyjwf/syntax_warning
      adds  d1ec493   Fix Python C++ implementation build issues:   1. Haven't included the include path for "config.h".   2. Use of C++11 auto keyword.
      adds  9e9ca4b   Merge pull request #105 from xfxyjwf/fix_92
      adds  0610659   Replace links in nano proto code.
      adds  ef43113   Merge pull request #111 from xfxyjwf/googlebot
      adds  8f7dec8   Add a ./configure flag "DIST_LANG" to select which langauge to include in a distribution package.
      adds  e45149b   Merge pull request #115 from xfxyjwf/fix_107
      adds  9173ba2   Get rid of some build warnings.
      adds  a451681   Merge pull request #116 from xfxyjwf/fix_warnings
      adds  7793199   Explicitly list all Java lite runtime tests (and exclude those depending TestUtil which transitively depend on the full runtime).
      adds  81a630c   Update version number to v3.0.0-alpha-1
      adds  58dfce9   Update version number in descriptor.pb.h and plugin.pb.h. Protect death tests with macro PROTOBUF_HAS_DEATH_TEST.
      adds  35ef680   Add a missing Java dist file.
      adds  137dd0f   Delete some globals in ShutdownProtobufLibrary().
      adds  6936f17   Update post_process_dist.sh to produce a separate package for each language.
      adds  0eaae1e   Replace is_enum with is_proto_enum because is_enum is not supported on some platforms.
      adds  6a949cd   Remove usage of features not supported in Java 1.6.
      adds  d778778   Fix thread local annotatoin and add back type traits is_convertable for MSVC
      adds  7c939bc   Update VC projects to include new source files.
      adds  be20ae0   Fix compile issues and test failures in VS2008.
      adds  9104da3   Down-integrate from internal code base.
      adds  7da8121   Fix the intermediate directory of vc project files.
      adds  fe3be0b   Fix vsprojects/extract_includes.bat
      adds  496d47c   Remove map_field.cc from lite-runtime.
      adds  8d5d7cc   Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.
      adds  5cf5dba   Imported Upstream version 3.0.0~alpha-1
      adds  2c495e4   Ignore artifacts from autogen.sh
      adds  a0d9c59   Merge pull request #127 from tseaver/ignore-autogen-artifacts
      adds  973f425   Provide a Ruby extension.
      adds  261fe97   Merge pull request #121 from cfallin/master
      adds  5290948   Merge branch v3.0.0-alpha-1 into master.
      adds  cb0ba5f   Update version number to v3.0.0-pre
      adds  5fd12b8   Update gtest version to v1.7.0.
      adds  78c8200   Describe how to get gtest source for Visual Studio users.
      adds  8ba0e35   Make test code runnable with C++11
      adds  4470dcb   Display element name in test error log
      adds  2413cb5   Make C++ string oneof field compatible with C++11
      adds  001e82a   Merge pull request #113 from nsuke/oneof-c++11
      adds  a761f06   Source code refactoring. Extracted common functionality in cpp_helpers.cc and python/python_generator.cc
      adds  7654f78   Fixed bugs
      adds  060a209   Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.cc
      adds  22f96a7   Returned print_indent and print_outdent back to printservicestub and printserviceclass in python generator
      adds  91552ad   Reverting the space at the end
      adds  2e9f5e3   Reverting the space at the end for both files changed
      adds  f473bb9   Merge pull request #128 from krishnanm86/master
      adds  cb3caf1   Integrate changes from Google open-source branch.
      adds  91473dc   Rename protobuf Ruby module to google/protobuf and rework its build system. The Ruby module build now uses an amalgamated distribution of upb, and successfully builds a Ruby gem called 'google-protobuf' with module 'google/protobuf'.
      adds  ed52203   Merge pull request #134 from cfallin/master
      adds  0c7f624   Adds Travis Cl support to test the code automatically.
      adds  e7d562a   Update ruby DIST_FILES.
      adds  044e095   Add missing header files in src/Makefile.am
      adds  5ce69e9   Support Ruby code generation only for proto3.
      adds  59692c3   Merge pull request #136 from cfallin/ruby-proto3-only
      adds  c3e9280   Improved little endian byte order detection
      adds  bc3af60   Merge pull request #139 from c0nk/master
      adds  5337cf5   Add __version__
      adds  6f7aa2f   Revert "Add __version__"
      adds  374b951   Add __version__
      adds  4f0170d   Updated __version__
      adds  b60a6df   Merge pull request #46 from adalq/version
      adds  4186d4c   Update python version / setuptools instructions
      adds  644a6a1   Merge pull request #143 from Ivoz/patch-1
      adds  aa1713d   Include names.h as java_names.h in the opensource tree
      adds  a6b3ab0   Align backslash vertically
      adds  052e020   Merge pull request #160 from zhangkun83/master
      adds  fd1a3ff   Support for maps in the MRI C Ruby extension.
      adds  80276ac   Addressed code-review comments.
      adds  4c92289   Addressed code-review comments.
      adds  97b663a   Update upb amalgamation.
      adds  addd26c   Addressed code-review comments.
      adds  ace4212   Line-wraps at 80 chars.
      adds  5446dea   Merge pull request #155 from cfallin/ruby-maps
      adds  ae11803   Delete unused files.
      adds  f01c144   Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer.
      adds  76cb776   Merge pull request #180 from ned14/master
      adds  8ccaa42   Remove deleted files from Makefile.am.
      adds  fcd8889   Support oneofs in MRI Ruby C extension.
      adds  7c4bbf0   Support oneofs in the Ruby code generator.
      adds  3f3820d   Two tests for Ruby code generator:
      adds  b0670dd   Fix golden-file Ruby test to work with out-of-tree builds.
      adds  e1b7d38   Addressed code-review comments.
      adds  e2debef   Ruby extension: added oneof accessor.
      adds  9de35e7   Addressed code-review comments.
      adds  07b8b0f   Addressed code-review comments.
      adds  eb33f9d   Updated based on code-review comments.
      adds  a3953da   Updated based on code-review comments.
      adds  17e4419   Merge pull request #168 from cfallin/ruby-oneof
      adds  ec53b8c   added missing ruby generator to msvc project
      adds  df4730c   fixed MSVC compile error
      adds  e1e86b0   replaced type fix with the recommended way
      adds  e544b38   removed accidental whitespace
      adds  a22bc81   Merge pull request #186 from ennerf/win32-msvc-fix
      adds  ee5f6e9   add #to_ary to RepeatedField
      adds  e7e79a4   Merge pull request #190 from isaiah/to_ary
      adds  a507592   Updated to latest upb and added test for JSON map operation.
      adds  06bf630   README.md update for Ruby gem.
      adds  20490e3   Merge pull request #189 from cfallin/update-ruby-upb
      adds  de525ec   Add missing LIBPROTOC_EXPORT to ruby generator
      adds  2e5123a   Merge pull request #197 from nsuke/protoc-export-ruby
      adds  7af23e8   Add java compiled targets and several tests target into .gitignore.
      adds  504d124   Merge pull request #203 from pherl/gitignore
      adds  b61b0c3   MIPS: remove immediate constraint within CompareAndSwap.
      adds  43beb62   Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fix
      adds  a2bea0a   Properly support maps in Ruby protoc and another bugfix.
      adds  315b93f   Addressed code-review comment.
      adds  344a921   Merge pull request #209 from cfallin/ruby-protoc-maps
      adds  4502626   Google::Protobuf::Map#inspect should be consistent with Hash#inspect
      adds  db87a9c   Merge pull request #211 from isaiah/map_inspect
      adds  dce8165   Initial checkin for maps support in JavaNano.
      adds  03b1416   Add tests for JavaNano maps.
      adds  ab74fd1   Add package for map test for nano.
      adds  4a99897   Use map generator for maps field; skip entry message.
      adds  60bccb6   MOVE TYPE_XXX constants to InternalNano.
      adds  0f2a7d3   Add readData(int) to read primitive value.
      adds  4d64e65   Parsing for Maps in JavaNano
      adds  d5839d2   parsing and serialzation for maps in JavaNano.
      adds  3c0355e   Moving internal code to InternalNano and rename MapUtil to MapFactories.
      adds  0d52964   Basic serialization/parsing test.
      adds  ca35a80   Test keys and values cannot be null.
      adds  bd3573c   Fix the behavior when merging conflicting keys, the new value always override the existing one even for message types.
      adds  7f36931   Add tests merging empty entries in JavaNano map
      adds  cd99c12   Rename readData() to readPrimitiveField() in JavaNano.
      adds  b0f1948   Rename empty bytes in JavaNano.
      adds  1536e93   Implement Equals for nano.
      adds  d9a6f27   implement hashCode() for JavaNano maps.
      adds  12d8a51   Get the map factory per mergeFrom() call for JavaNano.
      adds  33ccbcb   Add java compiled targets and several tests target into .gitignore.
      adds  d1bbd85   Merge the javanano map test into the main test target.
      adds  c265fbe   Mark factory setter API as private for alpha release.
      adds  2cb2358   Merge pull request #204 from pherl/master
      adds  55cf8ab   Merge branch 'master' of github.com:google/protobuf
      adds  b262575   Merge pull request #212 from haberman/update-from-google
      adds  fbfdbe8   Use EMPTY_BYTES in WireFormatNano
      adds  709164e   Merge pull request #213 from pherl/maps
      adds  f0e08fd   Support maps in NanoPrinter.
      adds  33222b5   Initial check in for primitive oneof fields.
      adds  7794a98   Initial check-in for message oneof.
      adds  c72d3d5   Oneof message level elements (consts, case getter/clear) and messsage type field oneof support.
      adds  06a2e29   Equals for message oneof field in nano.
      adds  f173cde   hashcode and equals for oneofs in nano.
      adds  3accf81   Clear oneofs.
      adds  3ab660c   Uncomment string/bytes fields in oneof nano.
      adds  b9e9469   Add tests for oneof equals and hash.
      adds  7b72a24   fix equal and hash for bytes field for javanano oneof
      adds  9681503   partial oneof tests.
      adds  72776c3   Add tests for oneofs.
      adds  f2cf6cd   Remove the unused set common oneof variables in helper
      adds  a6fc5da   Fix review comments.
      adds  0a7fc8f   Add test for debug string for oneof
      adds  7c43f17   Use static_cast instead of dynamic_cast in arena unittest so that it can pass in systems without rtti.
      adds  32f5d01   Add changelog for 3.0.0-alpha2 release.
      adds  1d4f321   Updated CHANGES.txt to mention Ruby extension.
      adds  6ad8f54   Updated Ruby README.
      adds  5d9cc7d   Merge pull request #214 from cfallin/ruby-changelog
      adds  11ad1bd   Update Ruby gem version to 3.0.0.alpha.2.0.
      adds  561ea89   Merge pull request #215 from cfallin/ruby-gem-version
      adds  7d8564f   Update version number to 3.0.0-alpha-2
      adds  ff35de3   Include Ruby and JavaNano into dist packages.
      adds  7a00a1e   Add shutdown code for several newly introduced leaks; Disable commandline interface test for heap check tests.
      adds  5b033ae   Add JavaNano and Ruby protoc files into vs proj
      adds  21fb217   Updated Ruby README with more details on getting started.
      adds  20042b7   Fix Java maps reflection to call onChange to populate changes to parent builders.
      adds  e70329c   Propogate onChange() event when getFooBuilder() is on an oneof message field.
      adds  581a526   Add unix tools instructions for Mac.
      adds  df184fb   Make maps fields work on installed C++ protobufs.
      adds  b670960   Include shared_ptr.h into headers to make maps proto work. It is used in the map_field_inl.h
      adds  c2f2bce   Update .gitignore so that the newly-added config.h is visible to git.
      adds  3feaac7   Merge "Update .gitignore so that the newly-added config.h is visible to git." into v3.0.0-alpha-2
      adds  581be24   Merge alpha branch 'review/v3.0.0-alpha-2'
      adds  ada6556   Down integrate from Google  internal.
      adds  0b70a43   Fixes for Python/C++ implementation in open-source:
      adds  f8e7a46   Merge pull request #221 from google/python_proto3
      adds  a86baaa   Exclude pbconfg.h from dist, otherwise it breaks VS builds.
      adds  97dacc4   Fix the order of BUILT_FILES so that pbconfig.h will be built before anyother targets.
      adds  31e8c20   Added release notes about Python changes.
      adds  7d5cf8d   A few tweaks to CHANGES.txt.
      adds  f806b15   Imported Upstream version 3.0.0~alpha-2

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |    74 +
 .travis.yml                                        |     4 +
 Android.mk                                         |   486 +
 CHANGES.txt                                        |   186 +
 CONTRIBUTORS.txt                                   |     9 +
 LICENSE                                            |    15 +-
 Makefile.am                                        |   170 +-
 Makefile.in                                        |  1141 --
 README.md                                          |    26 +
 aclocal.m4                                         |  1194 --
 autogen.sh                                         |     8 +-
 benchmarks/ProtoBench.java                         |   203 +
 benchmarks/google_message1.dat                     |   Bin 0 -> 228 bytes
 benchmarks/google_message2.dat                     |   Bin 0 -> 84570 bytes
 benchmarks/google_size.proto                       |   136 +
 benchmarks/google_speed.proto                      |   136 +
 benchmarks/readme.txt                              |    50 +
 compile                                            |   347 -
 config.guess                                       |  1558 --
 config.h.in                                        |   152 -
 config.h.include                                   |     7 +
 config.sub                                         |  1791 --
 configure                                          | 19726 ------------------
 configure.ac                                       |    13 +-
 depcomp                                            |   791 -
 editors/proto.vim                                  |     2 +-
 gtest/CHANGES                                      |   130 -
 gtest/CMakeLists.txt                               |   250 -
 gtest/CONTRIBUTORS                                 |    37 -
 gtest/LICENSE                                      |    28 -
 gtest/Makefile.am                                  |   305 -
 gtest/Makefile.in                                  |  1760 --
 gtest/README                                       |   434 -
 gtest/aclocal.m4                                   |  1389 --
 gtest/build-aux/compile                            |   347 -
 gtest/build-aux/config.guess                       |  1558 --
 gtest/build-aux/config.h.in                        |    69 -
 gtest/build-aux/config.sub                         |  1791 --
 gtest/build-aux/depcomp                            |   791 -
 gtest/build-aux/install-sh                         |   527 -
 gtest/build-aux/ltmain.sh                          |  9661 ---------
 gtest/build-aux/missing                            |   215 -
 gtest/build-aux/test-driver                        |   139 -
 gtest/cmake/internal_utils.cmake                   |   227 -
 gtest/codegear/gtest.cbproj                        |   138 -
 gtest/codegear/gtest.groupproj                     |    54 -
 gtest/codegear/gtest_all.cc                        |    38 -
 gtest/codegear/gtest_link.cc                       |    40 -
 gtest/codegear/gtest_main.cbproj                   |    82 -
 gtest/codegear/gtest_unittest.cbproj               |    88 -
 gtest/configure                                    | 18386 -----------------
 gtest/configure.ac                                 |    68 -
 gtest/fused-src/gtest/gtest-all.cc                 |  9251 ---------
 gtest/fused-src/gtest/gtest.h                      | 20012 -------------------
 gtest/fused-src/gtest/gtest_main.cc                |    38 -
 gtest/include/gtest/gtest-death-test.h             |   294 -
 gtest/include/gtest/gtest-message.h                |   230 -
 gtest/include/gtest/gtest-param-test.h             |  1421 --
 gtest/include/gtest/gtest-param-test.h.pump        |   487 -
 gtest/include/gtest/gtest-printers.h               |   855 -
 gtest/include/gtest/gtest-spi.h                    |   232 -
 gtest/include/gtest/gtest-test-part.h              |   179 -
 gtest/include/gtest/gtest-typed-test.h             |   259 -
 gtest/include/gtest/gtest.h                        |  2236 ---
 gtest/include/gtest/gtest_pred_impl.h              |   358 -
 gtest/include/gtest/gtest_prod.h                   |    58 -
 .../gtest/internal/gtest-death-test-internal.h     |   319 -
 gtest/include/gtest/internal/gtest-filepath.h      |   206 -
 gtest/include/gtest/internal/gtest-internal.h      |  1171 --
 gtest/include/gtest/internal/gtest-linked_ptr.h    |   233 -
 .../gtest/internal/gtest-param-util-generated.h    |  5143 -----
 .../internal/gtest-param-util-generated.h.pump     |   301 -
 gtest/include/gtest/internal/gtest-param-util.h    |   619 -
 gtest/include/gtest/internal/gtest-port.h          |  1947 --
 gtest/include/gtest/internal/gtest-string.h        |   180 -
 gtest/include/gtest/internal/gtest-tuple.h         |  1012 -
 gtest/include/gtest/internal/gtest-tuple.h.pump    |   339 -
 gtest/include/gtest/internal/gtest-type-util.h     |  3332 ---
 .../include/gtest/internal/gtest-type-util.h.pump  |   298 -
 gtest/m4/acx_pthread.m4                            |   363 -
 gtest/m4/gtest.m4                                  |    74 -
 gtest/m4/libtool.m4                                |  7997 --------
 gtest/m4/ltoptions.m4                              |   384 -
 gtest/m4/ltsugar.m4                                |   123 -
 gtest/m4/ltversion.m4                              |    23 -
 gtest/m4/lt~obsolete.m4                            |    98 -
 gtest/make/Makefile                                |    80 -
 gtest/msvc/gtest-md.sln                            |    45 -
 gtest/msvc/gtest-md.vcproj                         |   126 -
 gtest/msvc/gtest.sln                               |    45 -
 gtest/msvc/gtest.vcproj                            |   126 -
 gtest/msvc/gtest_main-md.vcproj                    |   129 -
 gtest/msvc/gtest_main.vcproj                       |   129 -
 gtest/msvc/gtest_prod_test-md.vcproj               |   164 -
 gtest/msvc/gtest_prod_test.vcproj                  |   164 -
 gtest/msvc/gtest_unittest-md.vcproj                |   147 -
 gtest/msvc/gtest_unittest.vcproj                   |   147 -
 gtest/samples/prime_tables.h                       |   123 -
 gtest/samples/sample1.cc                           |    68 -
 gtest/samples/sample1.h                            |    43 -
 gtest/samples/sample10_unittest.cc                 |   144 -
 gtest/samples/sample1_unittest.cc                  |   153 -
 gtest/samples/sample2.cc                           |    56 -
 gtest/samples/sample2.h                            |    85 -
 gtest/samples/sample2_unittest.cc                  |   109 -
 gtest/samples/sample3-inl.h                        |   172 -
 gtest/samples/sample3_unittest.cc                  |   151 -
 gtest/samples/sample4.cc                           |    46 -
 gtest/samples/sample4.h                            |    53 -
 gtest/samples/sample4_unittest.cc                  |    45 -
 gtest/samples/sample5_unittest.cc                  |   199 -
 gtest/samples/sample6_unittest.cc                  |   224 -
 gtest/samples/sample7_unittest.cc                  |   130 -
 gtest/samples/sample8_unittest.cc                  |   173 -
 gtest/samples/sample9_unittest.cc                  |   160 -
 gtest/scripts/fuse_gtest_files.py                  |   250 -
 gtest/scripts/gen_gtest_pred_impl.py               |   730 -
 gtest/scripts/gtest-config.in                      |   274 -
 gtest/scripts/pump.py                              |   855 -
 gtest/scripts/test/Makefile                        |    59 -
 gtest/src/gtest-all.cc                             |    48 -
 gtest/src/gtest-death-test.cc                      |  1341 --
 gtest/src/gtest-filepath.cc                        |   381 -
 gtest/src/gtest-internal-inl.h                     |  1056 -
 gtest/src/gtest-port.cc                            |   805 -
 gtest/src/gtest-printers.cc                        |   364 -
 gtest/src/gtest-test-part.cc                       |   110 -
 gtest/src/gtest-typed-test.cc                      |   110 -
 gtest/src/gtest.cc                                 |  4838 -----
 gtest/src/gtest_main.cc                            |    38 -
 gtest/test/gtest-death-test_ex_test.cc             |    93 -
 gtest/test/gtest-death-test_test.cc                |  1368 --
 gtest/test/gtest-filepath_test.cc                  |   680 -
 gtest/test/gtest-linked_ptr_test.cc                |   154 -
 gtest/test/gtest-listener_test.cc                  |   310 -
 gtest/test/gtest-message_test.cc                   |   159 -
 gtest/test/gtest-options_test.cc                   |   215 -
 gtest/test/gtest-param-test2_test.cc               |    65 -
 gtest/test/gtest-param-test_test.cc                |   897 -
 gtest/test/gtest-param-test_test.h                 |    57 -
 gtest/test/gtest-port_test.cc                      |  1253 --
 gtest/test/gtest-printers_test.cc                  |  1561 --
 gtest/test/gtest-test-part_test.cc                 |   208 -
 gtest/test/gtest-tuple_test.cc                     |   320 -
 gtest/test/gtest-typed-test2_test.cc               |    45 -
 gtest/test/gtest-typed-test_test.cc                |   360 -
 gtest/test/gtest-typed-test_test.h                 |    66 -
 gtest/test/gtest-unittest-api_test.cc              |   341 -
 gtest/test/gtest_all_test.cc                       |    47 -
 gtest/test/gtest_break_on_failure_unittest.py      |   218 -
 gtest/test/gtest_break_on_failure_unittest_.cc     |    88 -
 gtest/test/gtest_catch_exceptions_test.py          |   223 -
 gtest/test/gtest_catch_exceptions_test_.cc         |   311 -
 gtest/test/gtest_color_test.py                     |   130 -
 gtest/test/gtest_color_test_.cc                    |    71 -
 gtest/test/gtest_env_var_test.py                   |   103 -
 gtest/test/gtest_env_var_test_.cc                  |   126 -
 gtest/test/gtest_environment_test.cc               |   192 -
 gtest/test/gtest_filter_unittest.py                |   633 -
 gtest/test/gtest_filter_unittest_.cc               |   140 -
 gtest/test/gtest_help_test.py                      |   172 -
 gtest/test/gtest_help_test_.cc                     |    46 -
 gtest/test/gtest_list_tests_unittest.py            |   177 -
 gtest/test/gtest_list_tests_unittest_.cc           |    85 -
 gtest/test/gtest_main_unittest.cc                  |    45 -
 gtest/test/gtest_no_test_unittest.cc               |    56 -
 gtest/test/gtest_output_test.py                    |   335 -
 gtest/test/gtest_output_test_.cc                   |  1034 -
 gtest/test/gtest_output_test_golden_lin.txt        |   725 -
 gtest/test/gtest_pred_impl_unittest.cc             |  2427 ---
 gtest/test/gtest_prod_test.cc                      |    57 -
 gtest/test/gtest_repeat_test.cc                    |   253 -
 gtest/test/gtest_shuffle_test.py                   |   325 -
 gtest/test/gtest_shuffle_test_.cc                  |   103 -
 gtest/test/gtest_sole_header_test.cc               |    57 -
 gtest/test/gtest_stress_test.cc                    |   256 -
 gtest/test/gtest_test_utils.py                     |   305 -
 gtest/test/gtest_throw_on_failure_ex_test.cc       |    92 -
 gtest/test/gtest_throw_on_failure_test.py          |   171 -
 gtest/test/gtest_throw_on_failure_test_.cc         |    72 -
 gtest/test/gtest_uninitialized_test.py             |    70 -
 gtest/test/gtest_uninitialized_test_.cc            |    43 -
 gtest/test/gtest_unittest.cc                       |  7240 -------
 gtest/test/gtest_xml_outfile1_test_.cc             |    49 -
 gtest/test/gtest_xml_outfile2_test_.cc             |    49 -
 gtest/test/gtest_xml_outfiles_test.py              |   132 -
 gtest/test/gtest_xml_output_unittest.py            |   284 -
 gtest/test/gtest_xml_output_unittest_.cc           |   177 -
 gtest/test/gtest_xml_test_utils.py                 |   190 -
 gtest/test/production.cc                           |    36 -
 gtest/test/production.h                            |    55 -
 gtest/xcode/Config/DebugProject.xcconfig           |    30 -
 gtest/xcode/Config/FrameworkTarget.xcconfig        |    17 -
 gtest/xcode/Config/General.xcconfig                |    41 -
 gtest/xcode/Config/ReleaseProject.xcconfig         |    32 -
 gtest/xcode/Config/StaticLibraryTarget.xcconfig    |    18 -
 gtest/xcode/Config/TestTarget.xcconfig             |     8 -
 gtest/xcode/Resources/Info.plist                   |    30 -
 gtest/xcode/Samples/FrameworkSample/Info.plist     |    28 -
 .../WidgetFramework.xcodeproj/project.pbxproj      |   457 -
 gtest/xcode/Samples/FrameworkSample/runtests.sh    |    62 -
 gtest/xcode/Samples/FrameworkSample/widget.cc      |    63 -
 gtest/xcode/Samples/FrameworkSample/widget.h       |    59 -
 gtest/xcode/Samples/FrameworkSample/widget_test.cc |    68 -
 gtest/xcode/Scripts/runtests.sh                    |    65 -
 gtest/xcode/Scripts/versiongenerate.py             |   100 -
 gtest/xcode/gtest.xcodeproj/project.pbxproj        |  1084 -
 install-sh                                         |   527 -
 java/pom.xml                                       |    35 +-
 .../java/com/google/protobuf/AbstractMessage.java  |    60 +-
 .../com/google/protobuf/BoundedByteString.java     |    17 +
 .../main/java/com/google/protobuf/ByteString.java  |     9 +-
 .../java/com/google/protobuf/CodedInputStream.java |    30 +-
 .../main/java/com/google/protobuf/Descriptors.java |   115 +
 .../java/com/google/protobuf/DynamicMessage.java   |    29 +-
 .../main/java/com/google/protobuf/Extension.java   |    23 +-
 ...ProtocolMessageEnum.java => ExtensionLite.java} |    41 +-
 .../main/java/com/google/protobuf/FieldSet.java    |     4 +-
 .../java/com/google/protobuf/GeneratedMessage.java |   376 +-
 .../com/google/protobuf/GeneratedMessageLite.java  |   378 +-
 .../main/java/com/google/protobuf/Internal.java    |   192 +-
 .../com/google/protobuf/LazyStringArrayList.java   |     4 +
 .../com/google/protobuf/LiteralByteString.java     |    11 +
 .../main/java/com/google/protobuf/MapEntry.java    |   433 +
 .../java/com/google/protobuf/MapEntryLite.java     |   331 +
 .../main/java/com/google/protobuf/MapField.java    |   259 +
 .../java/com/google/protobuf/MapFieldLite.java     |   182 +
 .../src/main/java/com/google/protobuf/Message.java |    19 +
 .../com/google/protobuf/MessageReflection.java     |    33 +-
 .../com/google/protobuf/RepeatedFieldBuilder.java  |    26 +-
 .../java/com/google/protobuf/RopeByteString.java   |    16 +
 .../com/google/protobuf/SingleFieldBuilder.java    |     2 +-
 .../main/java/com/google/protobuf/TextFormat.java  |    25 +-
 .../java/com/google/protobuf/UnknownFieldSet.java  |    15 +
 .../com/google/protobuf/UnknownFieldSetLite.java   |   297 +
 .../com/google/protobuf/BoundedByteStringTest.java |    19 +
 .../com/google/protobuf/CodedInputStreamTest.java  |    10 +-
 .../java/com/google/protobuf/DescriptorsTest.java  |     6 +
 .../com/google/protobuf/FieldPresenceTest.java     |   363 +
 .../com/google/protobuf/GeneratedMessageTest.java  |   155 +-
 .../com/google/protobuf/LazyMessageLiteTest.java   |    31 -
 .../com/google/protobuf/LiteEqualsAndHashTest.java |    23 +
 .../test/java/com/google/protobuf/LiteTest.java    |    13 +
 .../com/google/protobuf/LiteralByteStringTest.java |    16 +
 .../com/google/protobuf/MapForProto2LiteTest.java  |   277 +
 .../java/com/google/protobuf/MapForProto2Test.java |   502 +
 .../src/test/java/com/google/protobuf/MapTest.java |   615 +
 .../com/google/protobuf/RopeByteStringTest.java    |    18 +
 .../com/google/protobuf/TestBadIdentifiers.java    |     2 +-
 .../java/com/google/protobuf/TextFormatTest.java   |    33 +-
 .../com/google/protobuf/UnknownEnumValueTest.java  |   255 +
 .../google/protobuf/UnknownFieldSetLiteTest.java   |   316 +
 .../com/google/protobuf/field_presence_test.proto  |    93 +
 .../com/google/protobuf/lazy_fields_lite.proto     |     1 +
 .../com/google/protobuf/lite_equals_and_hash.proto |    17 +
 ...d_hash.proto => map_for_proto2_lite_test.proto} |    45 +-
 ...ls_and_hash.proto => map_for_proto2_test.proto} |    44 +-
 .../{lite_equals_and_hash.proto => map_test.proto} |    44 +-
 .../com/google/protobuf/multiple_files_test.proto  |     1 +
 .../com/google/protobuf/nested_builders_test.proto |     1 +
 .../com/google/protobuf/nested_extension.proto     |     1 +
 .../google/protobuf/nested_extension_lite.proto    |     1 +
 .../com/google/protobuf/non_nested_extension.proto |     1 +
 .../protobuf/non_nested_extension_lite.proto       |     1 +
 .../google/protobuf/outer_class_name_test.proto    |     2 +
 .../google/protobuf/outer_class_name_test2.proto   |     2 +
 .../google/protobuf/outer_class_name_test3.proto   |     2 +
 .../com/google/protobuf/test_bad_identifiers.proto |    24 +-
 .../java/com/google/protobuf/test_check_utf8.proto |     1 +
 .../com/google/protobuf/test_check_utf8_size.proto |     1 +
 .../com/google/protobuf/test_custom_options.proto  |     1 +
 ...sion_lite.proto => test_extra_interfaces.proto} |    33 +-
 javanano/README.txt                                |   356 +
 javanano/pom.xml                                   |   165 +
 .../protobuf/nano/CodedInputByteBufferNano.java    |   681 +
 .../protobuf/nano/CodedOutputByteBufferNano.java   |   708 +-
 .../protobuf/nano/ExtendableMessageNano.java       |   187 +
 .../java/com/google/protobuf/nano/Extension.java   |   687 +
 .../java/com/google/protobuf/nano/FieldArray.java  |   273 +
 .../java/com/google/protobuf/nano/FieldData.java   |   190 +
 .../com/google/protobuf/nano/InternalNano.java     |   555 +
 .../nano/InvalidProtocolBufferNanoException.java   |    69 +-
 .../com/google/protobuf/nano/MapFactories.java     |    55 +-
 .../java/com/google/protobuf/nano/MessageNano.java |   190 +
 .../google/protobuf/nano/MessageNanoPrinter.java   |   271 +
 .../com/google/protobuf/nano/UnknownFieldData.java |    74 +-
 .../com/google/protobuf/nano/WireFormatNano.java   |   124 +
 .../java/com/google/protobuf/nano/NanoTest.java    |  4388 ++++
 .../java/com/google/protobuf/nano/map_test.proto   |    71 +-
 .../protobuf/nano/unittest_accessors_nano.proto    |   118 +
 .../nano/unittest_enum_class_multiple_nano.proto   |    25 +-
 .../protobuf/nano/unittest_enum_class_nano.proto   |    24 +-
 .../nano/unittest_enum_validity_nano.proto         |    28 +
 .../protobuf/nano/unittest_extension_nano.proto    |    33 +
 .../nano/unittest_extension_packed_nano.proto      |    29 +
 .../nano/unittest_extension_repeated_nano.proto    |    34 +
 .../nano/unittest_extension_singular_nano.proto    |    34 +
 .../google/protobuf/nano/unittest_has_nano.proto   |    69 +-
 .../protobuf/nano/unittest_import_nano.proto       |    19 +-
 .../nano/unittest_multiple_nameclash_nano.proto    |    11 +-
 .../protobuf/nano/unittest_multiple_nano.proto     |    36 +-
 .../com/google/protobuf/nano/unittest_nano.proto   |   195 +
 .../protobuf/nano/unittest_recursive_nano.proto    |    26 +-
 .../nano/unittest_reference_types_nano.proto       |   116 +
 .../nano/unittest_repeated_merge_nano.proto        |    24 +-
 .../nano/unittest_repeated_packables_nano.proto    |    95 +
 .../protobuf/nano/unittest_simple_nano.proto       |    29 +-
 .../protobuf/nano/unittest_single_nano.proto       |     8 +-
 .../protobuf/nano/unittest_stringutf8_nano.proto   |    13 +-
 ltmain.sh                                          |  9661 ---------
 m4/libtool.m4                                      |  7997 --------
 m4/ltoptions.m4                                    |   384 -
 m4/ltsugar.m4                                      |   123 -
 m4/ltversion.m4                                    |    23 -
 m4/lt~obsolete.m4                                  |    98 -
 missing                                            |   215 -
 more_tests/Makefile                                |    41 +
 post_process_dist.sh                               |    68 +
 python/README.txt                                  |     9 +-
 python/google/protobuf/__init__.py                 |    35 +
 python/google/protobuf/descriptor.py               |   163 +-
 python/google/protobuf/descriptor_database.py      |     4 +-
 python/google/protobuf/descriptor_pool.py          |   116 +-
 python/google/protobuf/internal/_parameterized.py  |   438 +
 .../google/protobuf/internal/api_implementation.cc |    14 +-
 .../google/protobuf/internal/api_implementation.py |    38 +-
 python/google/protobuf/internal/containers.py      |    37 +-
 python/google/protobuf/internal/decoder.py         |     3 -
 .../protobuf/internal/descriptor_database_test.py  |     2 +
 .../protobuf/internal/descriptor_pool_test.py      |    29 +-
 .../protobuf/internal/descriptor_pool_test1.proto  |     2 +
 .../protobuf/internal/descriptor_pool_test2.proto  |     2 +
 python/google/protobuf/internal/descriptor_test.py |   186 +-
 .../google/protobuf/internal/factory_test1.proto   |     1 +
 .../google/protobuf/internal/factory_test2.proto   |     7 +
 python/google/protobuf/internal/generator_test.py  |     4 +-
 .../internal/import_test_package/__init__.py       |    17 +-
 .../internal/import_test_package/inner.proto       |    11 +-
 .../internal/import_test_package/outer.proto       |    11 +-
 python/google/protobuf/internal/message_test.py    |   787 +-
 .../protobuf/internal/missing_enum_values.proto    |     2 +
 .../google/protobuf/internal/more_extensions.proto |     1 +
 .../internal/more_extensions_dynamic.proto         |     1 +
 .../google/protobuf/internal/more_messages.proto   |     1 +
 ...ation_default_test.py => proto_builder_test.py} |    52 +-
 python/google/protobuf/internal/python_message.py  |   105 +-
 python/google/protobuf/internal/reflection_test.py |    70 +-
 .../protobuf/internal/service_reflection_test.py   |     2 +-
 .../protobuf/internal/test_bad_identifiers.proto   |     1 +
 python/google/protobuf/internal/test_util.py       |   170 +-
 .../google/protobuf/internal/text_format_test.py   |   556 +-
 python/google/protobuf/internal/type_checkers.py   |    17 +-
 .../protobuf/internal/unknown_fields_test.py       |   127 +-
 python/google/protobuf/message.py                  |    16 +-
 python/google/protobuf/proto_builder.py            |    98 +
 python/google/protobuf/pyext/cpp_message.py        |     6 +-
 python/google/protobuf/pyext/descriptor.cc         |  1485 +-
 python/google/protobuf/pyext/descriptor.h          |    82 +-
 .../google/protobuf/pyext/descriptor_containers.cc |  1564 ++
 .../google/protobuf/pyext/descriptor_containers.h  |    95 +
 python/google/protobuf/pyext/descriptor_pool.cc    |   370 +
 python/google/protobuf/pyext/descriptor_pool.h     |   152 +
 python/google/protobuf/pyext/extension_dict.cc     |   123 +-
 python/google/protobuf/pyext/extension_dict.h      |    25 +-
 python/google/protobuf/pyext/message.cc            |  1357 +-
 python/google/protobuf/pyext/message.h             |    73 +-
 python/google/protobuf/pyext/proto2_api_test.proto |     2 +
 python/google/protobuf/pyext/python.proto          |     2 +
 .../pyext/reflection_cpp2_generated_test.py        |    94 -
 .../protobuf/pyext/repeated_composite_container.cc |   186 +-
 .../protobuf/pyext/repeated_composite_container.h  |    19 +-
 .../protobuf/pyext/repeated_scalar_container.cc    |   273 +-
 .../protobuf/pyext/repeated_scalar_container.h     |    12 +-
 python/google/protobuf/pyext/scoped_pyobject_ptr.h |     4 +-
 python/google/protobuf/reflection.py               |    18 +-
 python/google/protobuf/text_format.py              |    51 +-
 python/mox.py                                      |     2 +-
 python/setup.py                                    |    42 +-
 ruby/README.md                                     |    74 +
 ruby/Rakefile                                      |    21 +
 ruby/ext/google/protobuf_c/defs.c                  |  1676 ++
 ruby/ext/google/protobuf_c/encode_decode.c         |  1167 ++
 ruby/ext/google/protobuf_c/extconf.rb              |    10 +
 ruby/ext/google/protobuf_c/map.c                   |   805 +
 ruby/ext/google/protobuf_c/message.c               |   516 +
 ruby/ext/google/protobuf_c/protobuf.c              |   105 +
 ruby/ext/google/protobuf_c/protobuf.h              |   533 +
 ruby/ext/google/protobuf_c/repeated_field.c        |   598 +
 ruby/ext/google/protobuf_c/storage.c               |   848 +
 ruby/ext/google/protobuf_c/upb.c                   | 11220 +++++++++++
 ruby/ext/google/protobuf_c/upb.h                   |  8050 ++++++++
 ruby/google-protobuf.gemspec                       |    24 +
 .../lib/google/protobuf.rb                         |    17 +-
 ruby/tests/basic.rb                                |  1004 +
 ruby/tests/generated_code.proto                    |    67 +
 ruby/tests/generated_code.rb                       |    74 +
 ruby/tests/generated_code_test.rb                  |    17 +
 ruby/tests/stress.rb                               |    38 +
 src/Makefile.am                                    |   169 +-
 src/Makefile.in                                    |  3641 ----
 src/google/protobuf/SEBS                           |   240 +
 src/google/protobuf/arena.cc                       |   258 +
 src/google/protobuf/arena.h                        |   486 +
 src/google/protobuf/{service.cc => arena_nc.cc}    |    21 +-
 .../google/protobuf/arena_nc_test.py               |    35 +-
 src/google/protobuf/arena_unittest.cc              |  1008 +
 .../{generated_message_util.cc => arenastring.cc}  |    34 +-
 src/google/protobuf/arenastring.h                  |   315 +
 src/google/protobuf/arenastring_unittest.cc        |   112 +
 .../protobuf/compiler/command_line_interface.cc    |     9 +-
 .../protobuf/compiler/command_line_interface.h     |     2 +-
 .../compiler/command_line_interface_unittest.cc    |    29 +-
 src/google/protobuf/compiler/cpp/cpp_enum.cc       |     9 +
 src/google/protobuf/compiler/cpp/cpp_enum_field.cc |   118 +-
 src/google/protobuf/compiler/cpp/cpp_extension.h   |     2 +-
 src/google/protobuf/compiler/cpp/cpp_field.cc      |    37 +-
 src/google/protobuf/compiler/cpp/cpp_field.h       |    26 +-
 src/google/protobuf/compiler/cpp/cpp_file.cc       |    42 +-
 src/google/protobuf/compiler/cpp/cpp_file.h        |    11 +-
 src/google/protobuf/compiler/cpp/cpp_generator.cc  |     7 +-
 src/google/protobuf/compiler/cpp/cpp_helpers.cc    |    40 +-
 src/google/protobuf/compiler/cpp/cpp_helpers.h     |    41 +-
 src/google/protobuf/compiler/cpp/cpp_map_field.cc  |   255 +
 .../cpp/{cpp_extension.h => cpp_map_field.h}       |    59 +-
 src/google/protobuf/compiler/cpp/cpp_message.cc    |  1204 +-
 src/google/protobuf/compiler/cpp/cpp_message.h     |    15 +-
 .../protobuf/compiler/cpp/cpp_message_field.cc     |   383 +-
 .../protobuf/compiler/cpp/cpp_plugin_unittest.cc   |   130 +-
 .../protobuf/compiler/cpp/cpp_primitive_field.cc   |     8 +-
 src/google/protobuf/compiler/cpp/cpp_service.cc    |     2 +-
 .../protobuf/compiler/cpp/cpp_string_field.cc      |   546 +-
 .../protobuf/compiler/cpp/cpp_string_field.h       |     1 +
 .../compiler/cpp/cpp_test_bad_identifiers.proto    |    20 +-
 src/google/protobuf/compiler/cpp/cpp_unittest.cc   |    23 +-
 src/google/protobuf/compiler/importer.cc           |     9 +-
 src/google/protobuf/compiler/importer_unittest.cc  |   132 +-
 src/google/protobuf/compiler/java/java_context.h   |     5 +-
 src/google/protobuf/compiler/java/java_enum.cc     |    32 +-
 .../protobuf/compiler/java/java_enum_field.cc      |   354 +-
 .../protobuf/compiler/java/java_enum_field.h       |     2 +
 src/google/protobuf/compiler/java/java_field.cc    |    20 +-
 src/google/protobuf/compiler/java/java_field.h     |     5 +-
 src/google/protobuf/compiler/java/java_file.cc     |    41 +-
 src/google/protobuf/compiler/java/java_file.h      |    11 +-
 .../protobuf/compiler/java/java_generator.cc       |    11 +-
 src/google/protobuf/compiler/java/java_helpers.cc  |    20 +
 src/google/protobuf/compiler/java/java_helpers.h   |    28 +-
 .../protobuf/compiler/java/java_map_field.cc       |   455 +
 .../java/{java_enum.h => java_map_field.h}         |    83 +-
 src/google/protobuf/compiler/java/java_message.cc  |   661 +-
 src/google/protobuf/compiler/java/java_message.h   |     1 +
 .../protobuf/compiler/java/java_message_field.cc   |    55 +-
 .../java/{java_generator.h => java_names.h}        |    59 +-
 .../protobuf/compiler/java/java_plugin_unittest.cc |     5 +-
 .../protobuf/compiler/java/java_primitive_field.cc |    20 -
 .../compiler/java/java_shared_code_generator.cc    |    10 +-
 .../compiler/java/java_shared_code_generator.h     |     6 +-
 .../protobuf/compiler/java/java_string_field.cc    |    27 +-
 .../protobuf/compiler/javanano/javanano_enum.cc    |   111 +
 .../{java/java_enum.h => javanano/javanano_enum.h} |    32 +-
 .../compiler/javanano/javanano_enum_field.cc       |   520 +
 .../javanano_enum_field.h}                         |    91 +-
 .../compiler/javanano/javanano_extension.cc        |   150 +
 .../javanano/javanano_extension.h}                 |    45 +-
 .../protobuf/compiler/javanano/javanano_field.cc   |   209 +
 .../protobuf/compiler/javanano/javanano_field.h    |   129 +
 .../protobuf/compiler/javanano/javanano_file.cc    |   263 +
 .../{java/java_file.h => javanano/javanano_file.h} |    47 +-
 .../compiler/javanano/javanano_generator.cc        |   219 +
 .../javanano_generator.h}                          |    32 +-
 .../protobuf/compiler/javanano/javanano_helpers.cc |   585 +
 .../protobuf/compiler/javanano/javanano_helpers.h  |   199 +
 .../compiler/javanano/javanano_map_field.cc        |   186 +
 .../javanano_map_field.h}                          |    52 +-
 .../protobuf/compiler/javanano/javanano_message.cc |   615 +
 .../cpp_file.h => javanano/javanano_message.h}     |    72 +-
 .../compiler/javanano/javanano_message_field.cc    |   334 +
 .../javanano_message_field.h}                      |    75 +-
 .../protobuf/compiler/javanano/javanano_params.h   |   240 +
 .../compiler/javanano/javanano_primitive_field.cc  |   981 +
 .../compiler/javanano/javanano_primitive_field.h   |   149 +
 src/google/protobuf/compiler/main.cc               |    13 +-
 .../protobuf/compiler/mock_code_generator.cc       |     9 +-
 src/google/protobuf/compiler/parser.cc             |   159 +-
 src/google/protobuf/compiler/parser.h              |    24 +-
 src/google/protobuf/compiler/parser_unittest.cc    |   338 +-
 src/google/protobuf/compiler/plugin.pb.cc          |   330 +-
 src/google/protobuf/compiler/plugin.pb.h           |   294 +-
 src/google/protobuf/compiler/plugin.proto          |     1 +
 .../protobuf/compiler/python/python_generator.cc   |   122 +-
 .../protobuf/compiler/python/python_generator.h    |     5 +
 .../compiler/python/python_plugin_unittest.cc      |     5 +-
 .../protobuf/compiler/ruby/ruby_generator.cc       |   393 +
 .../{cpp/cpp_options.h => ruby/ruby_generator.h}   |    32 +-
 .../compiler/ruby/ruby_generator_unittest.cc       |   119 +
 src/google/protobuf/descriptor.cc                  |   745 +-
 src/google/protobuf/descriptor.h                   |   145 +-
 src/google/protobuf/descriptor.pb.cc               |  2568 +--
 src/google/protobuf/descriptor.pb.h                |  1798 +-
 src/google/protobuf/descriptor.proto               |    61 +-
 .../google/protobuf/descriptor_pb2_test.py         |    28 +-
 src/google/protobuf/descriptor_unittest.cc         |   627 +-
 src/google/protobuf/drop_unknown_fields_test.cc    |    88 +
 src/google/protobuf/dynamic_message.cc             |   147 +-
 src/google/protobuf/dynamic_message.h              |     5 +-
 src/google/protobuf/dynamic_message_unittest.cc    |    55 +
 src/google/protobuf/extension_set.cc               |   404 +-
 src/google/protobuf/extension_set.h                |    18 +-
 src/google/protobuf/extension_set_heavy.cc         |    17 +-
 src/google/protobuf/extension_set_unittest.cc      |   112 +
 .../protobuf/generated_message_reflection.cc       |   655 +-
 src/google/protobuf/generated_message_reflection.h |   104 +-
 src/google/protobuf/generated_message_util.cc      |     1 +
 src/google/protobuf/io/coded_stream.cc             |    15 +
 src/google/protobuf/io/coded_stream.h              |    53 +-
 src/google/protobuf/io/coded_stream_inl.h          |    11 +-
 src/google/protobuf/io/coded_stream_unittest.cc    |     1 +
 src/google/protobuf/io/gzip_stream.cc              |    11 +-
 src/google/protobuf/io/gzip_stream.h               |     1 +
 src/google/protobuf/io/printer.cc                  |    13 +
 src/google/protobuf/io/printer.h                   |     5 +
 src/google/protobuf/io/tokenizer.h                 |     2 +-
 .../protobuf/io/zero_copy_stream_impl_lite.cc      |     1 +
 .../protobuf/io/zero_copy_stream_impl_lite.h       |    31 +-
 .../protobuf/io/zero_copy_stream_unittest.cc       |    37 +
 src/google/protobuf/map.h                          |   311 +
 src/google/protobuf/map_entry.h                    |   455 +
 src/google/protobuf/map_field.cc                   |   140 +
 src/google/protobuf/map_field.h                    |   227 +
 src/google/protobuf/map_field_inl.h                |   278 +
 src/google/protobuf/map_field_test.cc              |   435 +
 ...t_public_lite.proto => map_lite_unittest.proto} |    11 +-
 ...test_import.proto => map_proto2_unittest.proto} |    48 +-
 src/google/protobuf/map_test.cc                    |  2252 +++
 src/google/protobuf/map_test_util.cc               |  1479 ++
 src/google/protobuf/map_test_util.h                |   149 +
 src/google/protobuf/map_type_handler.h             |   486 +
 .../{unittest_import.proto => map_unittest.proto}  |    62 +-
 src/google/protobuf/message.cc                     |   117 +
 src/google/protobuf/message.h                      |   200 +-
 src/google/protobuf/message_lite.cc                |    22 +
 src/google/protobuf/message_lite.h                 |    23 +-
 src/google/protobuf/message_unittest.cc            |    19 +
 src/google/protobuf/metadata.h                     |   164 +
 src/google/protobuf/new_delete_capture.cc          |   121 +
 src/google/protobuf/new_delete_capture.h           |   175 +
 src/google/protobuf/no_field_presence_test.cc      |   537 +
 src/google/protobuf/preserve_unknown_enum_test.cc  |   232 +
 src/google/protobuf/proto3_arena_unittest.cc       |   185 +
 .../{compiler/cpp/cpp_options.h => proto_cast.h}   |    40 +-
 ...enerated_message_util.cc => proto_cast_test.cc} |    43 +-
 src/google/protobuf/reflection.h                   |   306 +
 src/google/protobuf/reflection_internal.h          |   378 +
 src/google/protobuf/repeated_field.cc              |    72 +-
 src/google/protobuf/repeated_field.h               |  1120 +-
 src/google/protobuf/repeated_field_reflection.h    |   337 +
 .../protobuf/repeated_field_reflection_unittest.cc |   519 +-
 src/google/protobuf/repeated_field_unittest.cc     |    69 +-
 .../{service.cc => stubs/atomic_sequence_num.h}    |    28 +-
 src/google/protobuf/stubs/atomicops.h              |    14 +
 .../protobuf/stubs/atomicops_internals_aix.h       |   440 +
 .../protobuf/stubs/atomicops_internals_mips_gcc.h  |     4 +-
 src/google/protobuf/stubs/casts.h                  |   123 +
 src/google/protobuf/stubs/common.cc                |     1 +
 src/google/protobuf/stubs/common.h                 |   162 +-
 src/google/protobuf/stubs/common_unittest.cc       |    15 +-
 src/google/protobuf/stubs/fastmem.h                |   152 +
 src/google/protobuf/stubs/hash.h                   |    44 +-
 src/google/protobuf/stubs/map_util.h               |     2 -
 src/google/protobuf/stubs/platform_macros.h        |     5 +
 .../cpp/cpp_options.h => stubs/singleton.h}        |    52 +-
 src/google/protobuf/stubs/strutil.cc               |    56 +
 src/google/protobuf/stubs/strutil.h                |    32 +
 src/google/protobuf/stubs/template_util.h          |     2 +-
 src/google/protobuf/stubs/type_traits.h            |    46 +-
 src/google/protobuf/stubs/type_traits_unittest.cc  |     5 +-
 src/google/protobuf/testdata/golden_message_proto3 |   Bin 0 -> 398 bytes
 src/google/protobuf/testing/file.cc                |     2 +
 src/google/protobuf/text_format.cc                 |    60 +-
 src/google/protobuf/text_format.h                  |     5 +-
 src/google/protobuf/text_format_unittest.cc        |    12 +-
 src/google/protobuf/unittest.proto                 |    13 +-
 .../google/protobuf/unittest_arena.proto           |    23 +-
 src/google/protobuf/unittest_custom_options.proto  |     3 +-
 .../protobuf/unittest_drop_unknown_fields.proto    |    31 +-
 .../protobuf/unittest_embed_optimize_for.proto     |     1 +
 src/google/protobuf/unittest_empty.proto           |     1 +
 .../protobuf/unittest_enormous_descriptor.proto    |     1 +
 src/google/protobuf/unittest_import.proto          |     4 +-
 src/google/protobuf/unittest_import_lite.proto     |     1 +
 src/google/protobuf/unittest_import_public.proto   |     1 +
 .../protobuf/unittest_import_public_lite.proto     |     1 +
 src/google/protobuf/unittest_lite.proto            |     1 +
 .../protobuf/unittest_lite_imports_nonlite.proto   |     1 +
 src/google/protobuf/unittest_mset.proto            |     2 +
 src/google/protobuf/unittest_no_arena.proto        |   200 +
 ...public.proto => unittest_no_arena_import.proto} |    13 +-
 .../protobuf/unittest_no_field_presence.proto      |   138 +
 .../protobuf/unittest_no_generic_services.proto    |     1 +
 src/google/protobuf/unittest_optimize_for.proto    |     1 +
 .../protobuf/unittest_preserve_unknown_enum.proto  |    47 +-
 src/google/protobuf/unittest_proto3_arena.proto    |   186 +
 src/google/protobuf/unknown_enum_impl.h            |   132 +
 .../google/protobuf/unknown_enum_test.proto        |    40 +-
 src/google/protobuf/unknown_field_set.cc           |   112 +-
 src/google/protobuf/unknown_field_set.h            |    40 +-
 src/google/protobuf/unknown_field_set_unittest.cc  |     7 +
 src/google/protobuf/wire_format.cc                 |    45 +-
 src/google/protobuf/wire_format_lite.cc            |    42 +-
 src/google/protobuf/wire_format_lite.h             |    28 +-
 src/google/protobuf/wire_format_lite_inl.h         |    26 +-
 src/google/protobuf/wire_format_unittest.cc        |     6 +-
 test-driver                                        |   139 -
 vsprojects/extract_includes.bat                    |    84 +-
 .../{config.h => google/protobuf/stubs/pbconfig.h} |    12 +-
 vsprojects/libprotobuf-lite.vcproj                 |    40 +-
 vsprojects/libprotobuf.vcproj                      |    96 +-
 vsprojects/libprotoc.vcproj                        |   986 +-
 vsprojects/lite-test.vcproj                        |     6 +-
 vsprojects/protobuf.sln                            |     4 +-
 vsprojects/protoc.vcproj                           |     6 +-
 vsprojects/readme.txt                              |     7 +
 vsprojects/test_plugin.vcproj                      |     6 +-
 vsprojects/tests.vcproj                            |   542 +-
 624 files changed, 82116 insertions(+), 199936 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .travis.yml
 create mode 100644 Android.mk
 delete mode 100644 Makefile.in
 delete mode 100644 aclocal.m4
 create mode 100644 benchmarks/ProtoBench.java
 create mode 100644 benchmarks/google_message1.dat
 create mode 100644 benchmarks/google_message2.dat
 create mode 100644 benchmarks/google_size.proto
 create mode 100644 benchmarks/google_speed.proto
 create mode 100644 benchmarks/readme.txt
 delete mode 100755 compile
 delete mode 100755 config.guess
 delete mode 100644 config.h.in
 create mode 100644 config.h.include
 delete mode 100755 config.sub
 delete mode 100755 configure
 delete mode 100755 depcomp
 delete mode 100644 gtest/CHANGES
 delete mode 100644 gtest/CMakeLists.txt
 delete mode 100644 gtest/CONTRIBUTORS
 delete mode 100644 gtest/LICENSE
 delete mode 100644 gtest/Makefile.am
 delete mode 100644 gtest/Makefile.in
 delete mode 100644 gtest/README
 delete mode 100644 gtest/aclocal.m4
 delete mode 100755 gtest/build-aux/compile
 delete mode 100755 gtest/build-aux/config.guess
 delete mode 100644 gtest/build-aux/config.h.in
 delete mode 100755 gtest/build-aux/config.sub
 delete mode 100755 gtest/build-aux/depcomp
 delete mode 100755 gtest/build-aux/install-sh
 delete mode 100644 gtest/build-aux/ltmain.sh
 delete mode 100755 gtest/build-aux/missing
 delete mode 100755 gtest/build-aux/test-driver
 delete mode 100644 gtest/cmake/internal_utils.cmake
 delete mode 100644 gtest/codegear/gtest.cbproj
 delete mode 100644 gtest/codegear/gtest.groupproj
 delete mode 100644 gtest/codegear/gtest_all.cc
 delete mode 100644 gtest/codegear/gtest_link.cc
 delete mode 100644 gtest/codegear/gtest_main.cbproj
 delete mode 100644 gtest/codegear/gtest_unittest.cbproj
 delete mode 100755 gtest/configure
 delete mode 100644 gtest/configure.ac
 delete mode 100644 gtest/fused-src/gtest/gtest-all.cc
 delete mode 100644 gtest/fused-src/gtest/gtest.h
 delete mode 100644 gtest/fused-src/gtest/gtest_main.cc
 delete mode 100644 gtest/include/gtest/gtest-death-test.h
 delete mode 100644 gtest/include/gtest/gtest-message.h
 delete mode 100644 gtest/include/gtest/gtest-param-test.h
 delete mode 100644 gtest/include/gtest/gtest-param-test.h.pump
 delete mode 100644 gtest/include/gtest/gtest-printers.h
 delete mode 100644 gtest/include/gtest/gtest-spi.h
 delete mode 100644 gtest/include/gtest/gtest-test-part.h
 delete mode 100644 gtest/include/gtest/gtest-typed-test.h
 delete mode 100644 gtest/include/gtest/gtest.h
 delete mode 100644 gtest/include/gtest/gtest_pred_impl.h
 delete mode 100644 gtest/include/gtest/gtest_prod.h
 delete mode 100644 gtest/include/gtest/internal/gtest-death-test-internal.h
 delete mode 100644 gtest/include/gtest/internal/gtest-filepath.h
 delete mode 100644 gtest/include/gtest/internal/gtest-internal.h
 delete mode 100644 gtest/include/gtest/internal/gtest-linked_ptr.h
 delete mode 100644 gtest/include/gtest/internal/gtest-param-util-generated.h
 delete mode 100644 gtest/include/gtest/internal/gtest-param-util-generated.h.pump
 delete mode 100644 gtest/include/gtest/internal/gtest-param-util.h
 delete mode 100644 gtest/include/gtest/internal/gtest-port.h
 delete mode 100644 gtest/include/gtest/internal/gtest-string.h
 delete mode 100644 gtest/include/gtest/internal/gtest-tuple.h
 delete mode 100644 gtest/include/gtest/internal/gtest-tuple.h.pump
 delete mode 100644 gtest/include/gtest/internal/gtest-type-util.h
 delete mode 100644 gtest/include/gtest/internal/gtest-type-util.h.pump
 delete mode 100644 gtest/m4/acx_pthread.m4
 delete mode 100644 gtest/m4/gtest.m4
 delete mode 100644 gtest/m4/libtool.m4
 delete mode 100644 gtest/m4/ltoptions.m4
 delete mode 100644 gtest/m4/ltsugar.m4
 delete mode 100644 gtest/m4/ltversion.m4
 delete mode 100644 gtest/m4/lt~obsolete.m4
 delete mode 100644 gtest/make/Makefile
 delete mode 100644 gtest/msvc/gtest-md.sln
 delete mode 100644 gtest/msvc/gtest-md.vcproj
 delete mode 100644 gtest/msvc/gtest.sln
 delete mode 100644 gtest/msvc/gtest.vcproj
 delete mode 100644 gtest/msvc/gtest_main-md.vcproj
 delete mode 100644 gtest/msvc/gtest_main.vcproj
 delete mode 100644 gtest/msvc/gtest_prod_test-md.vcproj
 delete mode 100644 gtest/msvc/gtest_prod_test.vcproj
 delete mode 100644 gtest/msvc/gtest_unittest-md.vcproj
 delete mode 100644 gtest/msvc/gtest_unittest.vcproj
 delete mode 100644 gtest/samples/prime_tables.h
 delete mode 100644 gtest/samples/sample1.cc
 delete mode 100644 gtest/samples/sample1.h
 delete mode 100644 gtest/samples/sample10_unittest.cc
 delete mode 100644 gtest/samples/sample1_unittest.cc
 delete mode 100644 gtest/samples/sample2.cc
 delete mode 100644 gtest/samples/sample2.h
 delete mode 100644 gtest/samples/sample2_unittest.cc
 delete mode 100644 gtest/samples/sample3-inl.h
 delete mode 100644 gtest/samples/sample3_unittest.cc
 delete mode 100644 gtest/samples/sample4.cc
 delete mode 100644 gtest/samples/sample4.h
 delete mode 100644 gtest/samples/sample4_unittest.cc
 delete mode 100644 gtest/samples/sample5_unittest.cc
 delete mode 100644 gtest/samples/sample6_unittest.cc
 delete mode 100644 gtest/samples/sample7_unittest.cc
 delete mode 100644 gtest/samples/sample8_unittest.cc
 delete mode 100644 gtest/samples/sample9_unittest.cc
 delete mode 100755 gtest/scripts/fuse_gtest_files.py
 delete mode 100755 gtest/scripts/gen_gtest_pred_impl.py
 delete mode 100755 gtest/scripts/gtest-config.in
 delete mode 100755 gtest/scripts/pump.py
 delete mode 100644 gtest/scripts/test/Makefile
 delete mode 100644 gtest/src/gtest-all.cc
 delete mode 100644 gtest/src/gtest-death-test.cc
 delete mode 100644 gtest/src/gtest-filepath.cc
 delete mode 100644 gtest/src/gtest-internal-inl.h
 delete mode 100644 gtest/src/gtest-port.cc
 delete mode 100644 gtest/src/gtest-printers.cc
 delete mode 100644 gtest/src/gtest-test-part.cc
 delete mode 100644 gtest/src/gtest-typed-test.cc
 delete mode 100644 gtest/src/gtest.cc
 delete mode 100644 gtest/src/gtest_main.cc
 delete mode 100644 gtest/test/gtest-death-test_ex_test.cc
 delete mode 100644 gtest/test/gtest-death-test_test.cc
 delete mode 100644 gtest/test/gtest-filepath_test.cc
 delete mode 100644 gtest/test/gtest-linked_ptr_test.cc
 delete mode 100644 gtest/test/gtest-listener_test.cc
 delete mode 100644 gtest/test/gtest-message_test.cc
 delete mode 100644 gtest/test/gtest-options_test.cc
 delete mode 100644 gtest/test/gtest-param-test2_test.cc
 delete mode 100644 gtest/test/gtest-param-test_test.cc
 delete mode 100644 gtest/test/gtest-param-test_test.h
 delete mode 100644 gtest/test/gtest-port_test.cc
 delete mode 100644 gtest/test/gtest-printers_test.cc
 delete mode 100644 gtest/test/gtest-test-part_test.cc
 delete mode 100644 gtest/test/gtest-tuple_test.cc
 delete mode 100644 gtest/test/gtest-typed-test2_test.cc
 delete mode 100644 gtest/test/gtest-typed-test_test.cc
 delete mode 100644 gtest/test/gtest-typed-test_test.h
 delete mode 100644 gtest/test/gtest-unittest-api_test.cc
 delete mode 100644 gtest/test/gtest_all_test.cc
 delete mode 100755 gtest/test/gtest_break_on_failure_unittest.py
 delete mode 100644 gtest/test/gtest_break_on_failure_unittest_.cc
 delete mode 100755 gtest/test/gtest_catch_exceptions_test.py
 delete mode 100644 gtest/test/gtest_catch_exceptions_test_.cc
 delete mode 100755 gtest/test/gtest_color_test.py
 delete mode 100644 gtest/test/gtest_color_test_.cc
 delete mode 100755 gtest/test/gtest_env_var_test.py
 delete mode 100644 gtest/test/gtest_env_var_test_.cc
 delete mode 100644 gtest/test/gtest_environment_test.cc
 delete mode 100755 gtest/test/gtest_filter_unittest.py
 delete mode 100644 gtest/test/gtest_filter_unittest_.cc
 delete mode 100755 gtest/test/gtest_help_test.py
 delete mode 100644 gtest/test/gtest_help_test_.cc
 delete mode 100755 gtest/test/gtest_list_tests_unittest.py
 delete mode 100644 gtest/test/gtest_list_tests_unittest_.cc
 delete mode 100644 gtest/test/gtest_main_unittest.cc
 delete mode 100644 gtest/test/gtest_no_test_unittest.cc
 delete mode 100755 gtest/test/gtest_output_test.py
 delete mode 100644 gtest/test/gtest_output_test_.cc
 delete mode 100644 gtest/test/gtest_output_test_golden_lin.txt
 delete mode 100644 gtest/test/gtest_pred_impl_unittest.cc
 delete mode 100644 gtest/test/gtest_prod_test.cc
 delete mode 100644 gtest/test/gtest_repeat_test.cc
 delete mode 100755 gtest/test/gtest_shuffle_test.py
 delete mode 100644 gtest/test/gtest_shuffle_test_.cc
 delete mode 100644 gtest/test/gtest_sole_header_test.cc
 delete mode 100644 gtest/test/gtest_stress_test.cc
 delete mode 100755 gtest/test/gtest_test_utils.py
 delete mode 100644 gtest/test/gtest_throw_on_failure_ex_test.cc
 delete mode 100755 gtest/test/gtest_throw_on_failure_test.py
 delete mode 100644 gtest/test/gtest_throw_on_failure_test_.cc
 delete mode 100755 gtest/test/gtest_uninitialized_test.py
 delete mode 100644 gtest/test/gtest_uninitialized_test_.cc
 delete mode 100644 gtest/test/gtest_unittest.cc
 delete mode 100644 gtest/test/gtest_xml_outfile1_test_.cc
 delete mode 100644 gtest/test/gtest_xml_outfile2_test_.cc
 delete mode 100755 gtest/test/gtest_xml_outfiles_test.py
 delete mode 100755 gtest/test/gtest_xml_output_unittest.py
 delete mode 100644 gtest/test/gtest_xml_output_unittest_.cc
 delete mode 100755 gtest/test/gtest_xml_test_utils.py
 delete mode 100644 gtest/test/production.cc
 delete mode 100644 gtest/test/production.h
 delete mode 100644 gtest/xcode/Config/DebugProject.xcconfig
 delete mode 100644 gtest/xcode/Config/FrameworkTarget.xcconfig
 delete mode 100644 gtest/xcode/Config/General.xcconfig
 delete mode 100644 gtest/xcode/Config/ReleaseProject.xcconfig
 delete mode 100644 gtest/xcode/Config/StaticLibraryTarget.xcconfig
 delete mode 100644 gtest/xcode/Config/TestTarget.xcconfig
 delete mode 100644 gtest/xcode/Resources/Info.plist
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/Info.plist
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/runtests.sh
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/widget.cc
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/widget.h
 delete mode 100644 gtest/xcode/Samples/FrameworkSample/widget_test.cc
 delete mode 100644 gtest/xcode/Scripts/runtests.sh
 delete mode 100644 gtest/xcode/Scripts/versiongenerate.py
 delete mode 100644 gtest/xcode/gtest.xcodeproj/project.pbxproj
 delete mode 100755 install-sh
 copy java/src/main/java/com/google/protobuf/{ProtocolMessageEnum.java => ExtensionLite.java} (65%)
 create mode 100644 java/src/main/java/com/google/protobuf/MapEntry.java
 create mode 100644 java/src/main/java/com/google/protobuf/MapEntryLite.java
 create mode 100644 java/src/main/java/com/google/protobuf/MapField.java
 create mode 100644 java/src/main/java/com/google/protobuf/MapFieldLite.java
 create mode 100644 java/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
 create mode 100644 java/src/test/java/com/google/protobuf/FieldPresenceTest.java
 create mode 100644 java/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
 create mode 100644 java/src/test/java/com/google/protobuf/MapForProto2Test.java
 create mode 100644 java/src/test/java/com/google/protobuf/MapTest.java
 create mode 100644 java/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
 create mode 100644 java/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
 create mode 100644 java/src/test/java/com/google/protobuf/field_presence_test.proto
 copy java/src/test/java/com/google/protobuf/{lite_equals_and_hash.proto => map_for_proto2_lite_test.proto} (64%)
 copy java/src/test/java/com/google/protobuf/{lite_equals_and_hash.proto => map_for_proto2_test.proto} (63%)
 copy java/src/test/java/com/google/protobuf/{lite_equals_and_hash.proto => map_test.proto} (67%)
 copy java/src/test/java/com/google/protobuf/{non_nested_extension_lite.proto => test_extra_interfaces.proto} (68%)
 create mode 100644 javanano/README.txt
 create mode 100644 javanano/pom.xml
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
 copy java/src/main/java/com/google/protobuf/CodedOutputStream.java => javanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java (58%)
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/Extension.java
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/FieldArray.java
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/FieldData.java
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/InternalNano.java
 copy java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java => javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java (59%)
 copy python/google/protobuf/internal/descriptor_pool_test2.proto => javanano/src/main/java/com/google/protobuf/nano/MapFactories.java (61%)
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/MessageNano.java
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
 copy python/google/protobuf/internal/descriptor_pool_test2.proto => javanano/src/main/java/com/google/protobuf/nano/UnknownFieldData.java (55%)
 create mode 100644 javanano/src/main/java/com/google/protobuf/nano/WireFormatNano.java
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
 copy java/src/test/java/com/google/protobuf/multiple_files_test.proto => javanano/src/test/java/com/google/protobuf/nano/map_test.proto (54%)
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
 copy java/src/test/java/com/google/protobuf/nested_builders_test.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto (83%)
 copy java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto (83%)
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
 copy java/src/test/java/com/google/protobuf/multiple_files_test.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto (59%)
 copy src/google/protobuf/unittest_import_lite.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_import_nano.proto (83%)
 copy src/google/protobuf/unittest_import_public.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto (87%)
 copy java/src/test/java/com/google/protobuf/nested_builders_test.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto (73%)
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
 copy src/google/protobuf/unittest_import_lite.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto (76%)
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
 copy java/src/test/java/com/google/protobuf/nested_builders_test.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto (82%)
 create mode 100644 javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
 copy src/google/protobuf/unittest_import_lite.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto (77%)
 copy src/google/protobuf/unittest_import_public.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto (92%)
 copy src/google/protobuf/unittest_import_public.proto => javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto (85%)
 delete mode 100644 ltmain.sh
 delete mode 100644 m4/libtool.m4
 delete mode 100644 m4/ltoptions.m4
 delete mode 100644 m4/ltsugar.m4
 delete mode 100644 m4/ltversion.m4
 delete mode 100644 m4/lt~obsolete.m4
 delete mode 100755 missing
 create mode 100755 more_tests/Makefile
 create mode 100755 post_process_dist.sh
 create mode 100755 python/google/protobuf/internal/_parameterized.py
 copy src/google/protobuf/io/gzip_stream_unittest.sh => python/google/protobuf/internal/import_test_package/__init__.py (78%)
 mode change 100755 => 100644
 copy src/google/protobuf/unittest_import_public.proto => python/google/protobuf/internal/import_test_package/inner.proto (90%)
 copy src/google/protobuf/unittest_import_public.proto => python/google/protobuf/internal/import_test_package/outer.proto (89%)
 rename python/google/protobuf/internal/{api_implementation_default_test.py => proto_builder_test.py} (56%)
 create mode 100644 python/google/protobuf/proto_builder.py
 create mode 100644 python/google/protobuf/pyext/descriptor_containers.cc
 create mode 100644 python/google/protobuf/pyext/descriptor_containers.h
 create mode 100644 python/google/protobuf/pyext/descriptor_pool.cc
 create mode 100644 python/google/protobuf/pyext/descriptor_pool.h
 delete mode 100755 python/google/protobuf/pyext/reflection_cpp2_generated_test.py
 create mode 100644 ruby/README.md
 create mode 100644 ruby/Rakefile
 create mode 100644 ruby/ext/google/protobuf_c/defs.c
 create mode 100644 ruby/ext/google/protobuf_c/encode_decode.c
 create mode 100644 ruby/ext/google/protobuf_c/extconf.rb
 create mode 100644 ruby/ext/google/protobuf_c/map.c
 create mode 100644 ruby/ext/google/protobuf_c/message.c
 create mode 100644 ruby/ext/google/protobuf_c/protobuf.c
 create mode 100644 ruby/ext/google/protobuf_c/protobuf.h
 create mode 100644 ruby/ext/google/protobuf_c/repeated_field.c
 create mode 100644 ruby/ext/google/protobuf_c/storage.c
 create mode 100644 ruby/ext/google/protobuf_c/upb.c
 create mode 100644 ruby/ext/google/protobuf_c/upb.h
 create mode 100644 ruby/google-protobuf.gemspec
 copy src/google/protobuf/io/gzip_stream_unittest.sh => ruby/lib/google/protobuf.rb (78%)
 mode change 100755 => 100644
 create mode 100644 ruby/tests/basic.rb
 create mode 100644 ruby/tests/generated_code.proto
 create mode 100644 ruby/tests/generated_code.rb
 create mode 100644 ruby/tests/generated_code_test.rb
 create mode 100644 ruby/tests/stress.rb
 delete mode 100644 src/Makefile.in
 create mode 100644 src/google/protobuf/SEBS
 create mode 100644 src/google/protobuf/arena.cc
 create mode 100644 src/google/protobuf/arena.h
 copy src/google/protobuf/{service.cc => arena_nc.cc} (84%)
 rename python/google/protobuf/pyext/descriptor_cpp2_test.py => src/google/protobuf/arena_nc_test.py (67%)
 create mode 100644 src/google/protobuf/arena_unittest.cc
 copy src/google/protobuf/{generated_message_util.cc => arenastring.cc} (75%)
 create mode 100755 src/google/protobuf/arenastring.h
 create mode 100644 src/google/protobuf/arenastring_unittest.cc
 create mode 100644 src/google/protobuf/compiler/cpp/cpp_map_field.cc
 copy src/google/protobuf/compiler/cpp/{cpp_extension.h => cpp_map_field.h} (59%)
 create mode 100644 src/google/protobuf/compiler/java/java_map_field.cc
 copy src/google/protobuf/compiler/java/{java_enum.h => java_map_field.h} (54%)
 copy src/google/protobuf/compiler/java/{java_generator.h => java_names.h} (67%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_enum.cc
 copy src/google/protobuf/compiler/{java/java_enum.h => javanano/javanano_enum.h} (81%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_enum_field.cc
 copy src/google/protobuf/compiler/{cpp/cpp_enum_field.h => javanano/javanano_enum_field.h} (53%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_extension.cc
 copy src/google/protobuf/{io/zero_copy_stream.cc => compiler/javanano/javanano_extension.h} (67%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_field.cc
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_field.h
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_file.cc
 copy src/google/protobuf/compiler/{java/java_file.h => javanano/javanano_file.h} (67%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_generator.cc
 copy src/google/protobuf/compiler/{java/java_generator.h => javanano/javanano_generator.h} (74%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_helpers.cc
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_helpers.h
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_map_field.cc
 copy src/google/protobuf/compiler/{java/java_generator.h => javanano/javanano_map_field.h} (61%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_message.cc
 copy src/google/protobuf/compiler/{cpp/cpp_file.h => javanano/javanano_message.h} (56%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_message_field.cc
 copy src/google/protobuf/compiler/{cpp/cpp_message_field.h => javanano/javanano_message_field.h} (58%)
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_params.h
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
 create mode 100644 src/google/protobuf/compiler/javanano/javanano_primitive_field.h
 create mode 100644 src/google/protobuf/compiler/ruby/ruby_generator.cc
 copy src/google/protobuf/compiler/{cpp/cpp_options.h => ruby/ruby_generator.h} (78%)
 create mode 100644 src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
 rename python/google/protobuf/pyext/message_factory_cpp2_test.py => src/google/protobuf/descriptor_pb2_test.py (70%)
 create mode 100644 src/google/protobuf/drop_unknown_fields_test.cc
 create mode 100644 src/google/protobuf/map.h
 create mode 100644 src/google/protobuf/map_entry.h
 create mode 100644 src/google/protobuf/map_field.cc
 create mode 100644 src/google/protobuf/map_field.h
 create mode 100644 src/google/protobuf/map_field_inl.h
 create mode 100644 src/google/protobuf/map_field_test.cc
 copy src/google/protobuf/{unittest_import_public_lite.proto => map_lite_unittest.proto} (90%)
 copy src/google/protobuf/{unittest_import.proto => map_proto2_unittest.proto} (68%)
 create mode 100644 src/google/protobuf/map_test.cc
 create mode 100644 src/google/protobuf/map_test_util.cc
 create mode 100644 src/google/protobuf/map_test_util.h
 create mode 100644 src/google/protobuf/map_type_handler.h
 copy src/google/protobuf/{unittest_import.proto => map_unittest.proto} (54%)
 create mode 100644 src/google/protobuf/metadata.h
 create mode 100644 src/google/protobuf/new_delete_capture.cc
 create mode 100644 src/google/protobuf/new_delete_capture.h
 create mode 100644 src/google/protobuf/no_field_presence_test.cc
 create mode 100644 src/google/protobuf/preserve_unknown_enum_test.cc
 create mode 100644 src/google/protobuf/proto3_arena_unittest.cc
 copy src/google/protobuf/{compiler/cpp/cpp_options.h => proto_cast.h} (69%)
 copy src/google/protobuf/{generated_message_util.cc => proto_cast_test.cc} (70%)
 create mode 100644 src/google/protobuf/reflection.h
 create mode 100644 src/google/protobuf/reflection_internal.h
 create mode 100644 src/google/protobuf/repeated_field_reflection.h
 copy src/google/protobuf/{service.cc => stubs/atomic_sequence_num.h} (78%)
 create mode 100644 src/google/protobuf/stubs/atomicops_internals_aix.h
 create mode 100644 src/google/protobuf/stubs/casts.h
 create mode 100644 src/google/protobuf/stubs/fastmem.h
 copy src/google/protobuf/{compiler/cpp/cpp_options.h => stubs/singleton.h} (69%)
 create mode 100644 src/google/protobuf/testdata/golden_message_proto3
 copy java/src/test/java/com/google/protobuf/non_nested_extension.proto => src/google/protobuf/unittest_arena.proto (82%)
 copy java/src/test/java/com/google/protobuf/nested_extension.proto => src/google/protobuf/unittest_drop_unknown_fields.proto (79%)
 create mode 100644 src/google/protobuf/unittest_no_arena.proto
 copy src/google/protobuf/{unittest_import_public.proto => unittest_no_arena_import.proto} (90%)
 create mode 100644 src/google/protobuf/unittest_no_field_presence.proto
 copy python/google/protobuf/internal/factory_test1.proto => src/google/protobuf/unittest_preserve_unknown_enum.proto (72%)
 create mode 100644 src/google/protobuf/unittest_proto3_arena.proto
 create mode 100644 src/google/protobuf/unknown_enum_impl.h
 copy python/google/protobuf/internal/factory_test1.proto => src/google/protobuf/unknown_enum_test.proto (69%)
 delete mode 100755 test-driver
 copy vsprojects/{config.h => google/protobuf/stubs/pbconfig.h} (74%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-protobuf/pkg-protobuf.git



More information about the Pkg-protobuf-devel mailing list