am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '3656cc20c8a569964d0450ce3207b651c007c35c':

am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':

am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '61317c325de4a7736ea88e72ff4be4193583e1c3':

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':

* commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':

am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '3af26f43dc55563842cee8604f1e802bf40a2585':

am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '90048528ee37be92be17cde8f351eb1b436cdc9e':

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 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '232698c44c5d0fec83030adcc4c2048964f2dc66':

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

* commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':

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

* commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':

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

* commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':

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

* commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':

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

* commit '5843426abfdb490874f9d523dac04a825580c7af':

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

* commit 'd043ff9d86baa219256036053f09dc5190f38f63':

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

* commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':

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

* commit '3628a851ca99c7b2058702aad9bb97f408513e56':

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

* commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':

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

* commit '01d1cdebf2de82c31ccd98909530213c489809a7':

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

* commit '23b66756ffe59505358b83f93ebe5880eb1be702':

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

* commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':

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

* commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':

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

* commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':

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

* commit '8948d605872d310771d1e9e73669778660a6b787':

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

* commit 'dce52afd8eb043950cbfac7e057362918159b07f':

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

* commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':

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

* commit 'e668f0c3a996574010b60daa74823bfa9429dcda':

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

* commit '74b536a558743acacb10e00aced05e59249a76bc':

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

* commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':

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

* commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':

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

* commit 'bd188bc73c8d0f6214192b66780764cf4315530e':

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

* commit '4734b9898c715a060e3d4f56ddf79be9fc6f2d1e':

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

* commit 'e90564050f017e6e5d78ed5328c21a2b445e1122':

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 'e655a86220da5f0e3a5135a0cf82ac4e114a2466':

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

* commit '8d2f4cf7214e1c6c2df85212cfbbd8859e04203a':

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

* commit 'c6ec950e9cc24aed39c2e6ba70b2760407b9d186':

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

* commit 'b42d51071f44afef6c4ca5afe1c76501a5b057c7':

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

* commit '2b2d73d26843cf178a1f23f30472934060194519':