* commit 'c50f605c572a425b2fa696fedc5e61ac6f66d2a9':
  Make generated code more aligned with Google Java style.

- Blank line after opening a message class (but not an enum interface).
- Let all code blocks insert blank lines before themselves. This applies to
  'package' statement, all message classes, enum classes or constant groups,
  extensions, bitfields, proto fields (one block per field; i.e. accessors
  don't have blank lines among them), and basic MessageNano methods. In this
  case we don't need to guess what the next block is and create blank lines
  for it.
- Fixed some newline/indent errors.
- Only one SuppressWarnings("hiding") per file.

Change-Id: I865f52ad4fb6ea3b3a98b97ac9d78d19fc46c858

* commit 'afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc':
  Fix repeated field merging semantics.

The public doc states that repeated fields are simply concatenated
and doesn't impose a different semantics for packed fields. This
CL fixes this for packed fields and adds tests covering all cases.

Also fixed a bit of missed null-repeated-field treatments.

Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2

* commit '63e819adbb4d2d8215f5d3d8297dc50bf2fe3329':
  Protect against null repeated fields.

* commit 'c85806baedfc98ad5759a990b35ea5b5f1ac4edb':

There's no distinction between a repeated field being null and being
empty. In both cases, nothing is sent on the wire. Clients might for
whatever reason inadvertently set a repeated field to null, so
protect against that and treat it just as if the field was empty.

Change-Id: Ic3846f7f2189d6cfff6f8ef3ca217daecc3c8be7

* commit '39cee9f1f5cd513a53ac5100eb208ed431f99af0':
  Remove all field initializers and let ctor call clear().

The field initializers have basically caused the compiled <init> method
to inline the whole clear() method, which means if ProGuard is not used
or failed to inline or remove clear(), there are two big chunks of code
that do the same thing. So why not just call clear() from the ctor.

Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0

* commit 'cbb08132821cb56f4e6c5e5f8a0b32f51879782a':
  Add missing README parts for enum_style and in-repo usage

Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73

* commit 'c4a1b547c91178d79f5d2cc2e00b8be922c22fe8':
  Add reftypes field generator option.

* commit '44cbb06c725fbba00464bba9f19dc0ea295406b1':
  Fix some indenting issues with set__() function

Previously it looked like this:

public final class OuterClass {
  [...]
  public static final class InnerClass extends
      com.google.protobuf.nano.MessageNano {
    [...]
    public void setId(java.lang.String value) {
      if (value == null) {
    throw new java.lang.NullPointerException();
  }
  id_ = value;
      bitfield0_ |= 0x00000001;
    [...]
  }
  [...]
}

Now it looks like this:

public final class OuterClass {
  [...]
  public static final class InnerClass extends
      com.google.protobuf.nano.MessageNano {
    [...]
    public void setId(java.lang.String value) {
      if (value == null) throw new java.lang.NullPointerException();
      id_ = value;
      bitfield0_ |= 0x00000001;
    [...]
  }
  [...]
}

Change-Id: I2a9289b528f785c846210d558206d677aa13e9be

This option generates fields as reference types, and serializes
based on nullness.

Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5
Signed-off-by: Brian Duff <bduff@google.com>

* commit '9827c718c45cfa1744a3b0f8fc27dac9cd415603':
  Fix roundtrip failure with groups when unknown fields are enabled.

When parsing a group, the group's end tag should not be stored within the
message's unknownFieldData. Not only does this waste space, it is also output
the next time the group is serialized, resulting in two end tags for that group.
The resulting bytes are not always a valid protocol buffer and may fail to
parse.

This change ensures that group end tags do not result in an unknownFieldData
entry, and that messages with groups can be roundtripped without corruption.

Change-Id: I240f858a7217a7652b756598c34aacad5dcc3363

Conflicts:
	java/src/test/java/com/google/protobuf/NanoTest.java

* commit '44dc2f1eaead8d95d3f5a4f80f9da87852053bfb':
  Implement enum_style=java option.

* commit '0d035e9b3485d26df106ff9118705d8476466674':
  Accessor style for optional fields.

This javanano_out command line option creates a container interface
at the normal place where the enum constants would reside, per enum
definition. The java_multiple_files flag would now affect the file-
scope enums with the shells. If the flag is true then file-scope
container interfaces are created in their own files.

Change-Id: Id52258fcff8d3dee9db8f3d8022147a811bf3565

* commit 'cc652daaec7fc6ebf8b12d361444364da257988b':
  Add some bitfield helper methods from 2.4

* commit '9e6afdf96f98259f89aad66367954a247b3e7817':
  Add two codegen parameters to nano.

This CL implements the 'optional_field_style=accessors' option.
All optional fields will now be 1 Java field and 1 bit in a shared
bitfield behind get/set/has/clear accessor methods. The setter
performs null check for reference types (Strings and byte[]s).

Also decentralized the clear code generation.

Change-Id: I60ac78329e352e76c2f8139fba1f292383080ad3

Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e

enum_style = c | java: 'c' to put the enum member int constants
at the parent scope; 'java' to create uninstantiatable shell
classes at the parent scope and put the int constants inside.

optional_field_style = default | accessors: 'default' to create
one public mutable field per optional proto field; 'accessors'
to encapsulate the generated fields behind get, set, has and
clear accessors.

This CL only contains parsing code for these two parameters.

Change-Id: Iec0c3b0f30af8eb7db328e790664306bc90be089

* commit '11c3b27d':
  Add a Gradle build file for the protobuf libraries.

Change-Id: Id785093c51eb423576292994a98d42efbbc3fddb

* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
  Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.