am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':

* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':

am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':

* commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':

am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':

* commit '291f0484a489990b7d59a78b91792fa3d935eb5c':

am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '89f0407f57f9127ab8d1040a06af741173faece2':

am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit 'b28d17386a434ee49e48d958823141036ed8c127':

am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '339f5a6db8053b4095af6454250e246ffeb8b295':

am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '34559f88be5c2071a9be321ed01725b364cdf29d':

am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '6f45464eb45eba2846ee9e96aaecd81fef4662ef':

am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c':

am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit 'c1d044c0b1b97265e3bef096acdaa503d9ec615a':

am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4':

am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit 'a155ce7ea537b9388e0785d74363f3e11177a5e0':

am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':

am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '3a324516bd8757996725ac3c28224bc41d5123be':

am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit '8d5b7fb23a951dabb95bce445ef588b68e6b0e63':

am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '6d879b4e0d411dd925978437c43e052cf3fba00e':

am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'a59cc53b9271c09380769f86846583a94349f390':

am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '9b07838482cc1c03bf486ea9b5f465d329bb07df':

am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '2267616c6621b748c8551c9895e47a792ee04cb2':

am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '4b700b8a8b6ed8151aa22b99b2e0dac214e251f3':

am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit '438ca4a840876afd43ac8cbea4df2130c0629072':

am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit '17395e556af77b06ea3de454d5c279802ec8cc49':

am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '826b4cf541f3d21f374e2749c48348c6539c6b2e':

am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':

am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '03016e747254a97144db2703106787b493fb5014':

am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'fa0eb541ce7abf79b1bf7ba5526d3418d74657ab':

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

* commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':

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

* commit 'a61b2ef1d7b372b858b6aae07cf3eebbf62184b8':

am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '056670c92d2a1420accbb07e636b895d925df2a1':

am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '73789372578a45ceae125e2f66254988ac7eed73':

am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit '8973d9e63f9f972d646b07719d9292752e3aa382':

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

* commit 'd8fbc18826e4945c45b22b5d36d5e07deb08bf0a':

am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '8877603f0c61a959ef667df563429589f3a71cc0':

am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':

am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':

am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':

* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':