* commit '139bd6ac80ca61f85796bded692eeb5bb932cfca':

* commit 'b88c1729d89e76b06ae3b87d90cae6ea36cfde90':

* commit '8eda9d3f991c62237a24e4d9f8e7f58df1687a86':

am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe':

am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '0610e6834fa213c026d91fab037a649613840f44':

am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '4b359335e94c44fa16b78c1406f3cd71b7fbf40b':

* commit '677d51bb86ca57654617dae9fe645995a1b22658':

* commit '8f903e123aff94f272aaae22e275924980433a47':

am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '0e5add1dd4a5ce73ff10b38307bae942be178d5b':

am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit 'ee8847c131e91c718a0f4d2af73ec56d9fd24d81':

am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit 'dc8f4a8bc871cf1ba6a27eaf7f581a144571411a':

* commit 'ca07ad9d617b3ebab5d66077413bdfc7673a2926':

* commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':

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

* commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':

* commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':

* commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':

* commit '6778e0a0198f602cab76daf6428a97292007dc71':

* commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':

* commit '380d1b5a78de07a081b36c890321ac61a0fced1a':
  Fix the merge conflict leftovers.

* commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':

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

* commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':

* commit 'ba363f1380e9b99e6606462b21febd2e4027e340':

am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '4d7f9ad71771fff628e88d463af94b44457b7934':

* commit 'f105476adedac50be509ed36cbb187b92fca54d9':

* commit '94f522f907e3f34f70d9e7816b947e62fddbb267':
  You CANNOT change the global WITH_DEXPREOPT

* commit '49512cb01065b41c0113248c2c02800de1156d50':
  You CANNOT change the global WITH_DEXPREOPT

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e

* commit '58eb8e98d17971273548930a7e8d45e69995a2c8':
  Fix NPE when clearing an extension in nano protos

* commit 'd20f0a4260763531acf5de677e4830afe0bfc53e':
  Fix NPE when clearing an extension in nano protos

If ExtendableMessageNano doesn't have any unknown fields, trying to
clear an extension by setting it to null would throw an NPE.

Change-Id: I6abcdfcc0193de44f97b21dd6cc2f40604938a1a

* commit 'ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce':

* commit '33a6680ab98977cd5b9b7b03f4875b9265cfec3b':
  Support generation of Parcelable nano messages.

This CL adds the "parcelable_messages" option. When enabled, all
generated message classes will conform to the Android Parcelable
contract. This is achieved by introducing a new parent class for
generated classes which implements the required functionality.

Since the store_unknown_fields option also makes use of a superclass,
ExtendableMessageNano, we have two versions of the new Parcelable
superclass: one extending MessageNano, and one extending
ExtendableMessageNano. These classes are otherwise identical.

As these classes depend on Android framework jars, they are not
included in the host .jar build of the nanoproto library.

Finally, add a test suite for running tests of Android-specific
functionality, as this cannot be done on a desktop JVM.

Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497

* commit '829f6c014ce69d04593d30652c8acc2f7a793851':
  Adds --ignore_service nano proto compiler flag

Nano proto compiler normally throws an error if any service is
defined. If --ignore-services=true is set, no error is thrown and the
service is simply skipped.

Change-Id: Id82583555085cc55550d03a485d3f0189885240b