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

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 '7632e0ad04851ea5524a9f52504e7dcdbc00c514':
  Add a Gradle build file for the protobuf libraries.

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

Change-Id: Id785093c51eb423576292994a98d42efbbc3fddb

am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '48ee66d295979372ed0234cefda42385daae8312':

* commit 'a38aedb3fff651a4e1921162d88df3e1c75726b3':

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

* commit 'e7b778b99f607460ed9ea88a13ec91164cda8537':
  Fix outer classname for javamicro/javanano.

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

* commit 'e7b778b99f607460ed9ea88a13ec91164cda8537':
  Fix outer classname for javamicro/javanano.