am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'e7b778b99f607460ed9ea88a13ec91164cda8537':
  Fix outer classname for javamicro/javanano.
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
  Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'a38aedb3fff651a4e1921162d88df3e1c75726b3':
am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '48ee66d295979372ed0234cefda42385daae8312':
am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '7632e0ad04851ea5524a9f52504e7dcdbc00c514':
  Add a Gradle build file for the protobuf libraries.
Fix the merge conflict leftovers.

Change-Id: I8738e69df79d7bee3fb06b57cbc9e67414a27261
am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '081ac0fc81819ad6d124d4133e6d2e4037ca9c5b':
  Add two codegen parameters to nano.
am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '2923f3d2d87c1acd41df5fa741d51c2bbafbd640':
  Add some bitfield helper methods from 2.4
am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '3f85c84042611b1f412a73023da8dcd9858037c3':
  Accessor style for optional fields.
am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '8f93f123e2597ba9c02c2792abe180e63a0d9d5b':
  Implement enum_style=java option.
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.
am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'fdbd1e42d8fdfde0efc3ed3d31f0ee95f5e324ac':
  Fix some indenting issues with set__() function
am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3':
  Add reftypes field generator option.
am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '7457ebc9ae3eee30ccb44f259a14316e7d9ab950':
  Add missing README parts for enum_style and in-repo usage
am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '145af9e8915a5e814d5deba8bcea68d066dd7f9e':
  Remove all field initializers and let ctor call clear().
am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '051ea13ce26ff0ff9dbc487c2b233b0159204e40':
am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'bf222b76dc346d3946a701ba675a7c31833f81fc':
  Protect against null repeated fields.
am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '5b4b84a18dc04b1b6c931c42403731fa79eb213d':
  Fix repeated field merging semantics.
am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'd52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17':
  Make generated code more aligned with Google Java style.
am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '7cb6b37f3799affce9e1be39977d4419283df795':
  Feature request: set() and clear() accessors return this