* commit 'bf222b76dc346d3946a701ba675a7c31833f81fc':
  Protect against null repeated fields.

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

* commit '051ea13ce26ff0ff9dbc487c2b233b0159204e40':

* 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 '145af9e8915a5e814d5deba8bcea68d066dd7f9e':
  Remove all field initializers and let ctor call clear().

* 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 '7457ebc9ae3eee30ccb44f259a14316e7d9ab950':
  Add missing README parts for enum_style and in-repo usage

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

Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73

* commit '570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3':
  Add reftypes field generator option.

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

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

* 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>

am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '0255eb04c74f86b9bd482d65331d6d8bb4eb3d18':
  Fix roundtrip failure with groups when unknown fields are enabled.

* 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 '8f93f123e2597ba9c02c2792abe180e63a0d9d5b':
  Implement enum_style=java option.

* commit '3f85c84042611b1f412a73023da8dcd9858037c3':
  Accessor style for optional fields.

* 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 '2923f3d2d87c1acd41df5fa741d51c2bbafbd640':
  Add some bitfield helper methods from 2.4

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

* commit '081ac0fc81819ad6d124d4133e6d2e4037ca9c5b':
  Add two codegen parameters to nano.

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