am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':

* commit '8add9962a5c88ff307d573be91bb091a2b14568d':

am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':

am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '7f3f30e96965e7189430e4acc53520275627264c':

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

* commit '7bf587289933768ada48e79cf43deecfad65c576':

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

* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':

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

* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':

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 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '1f8913765270e9d90ad7384156629e116236355d':

* commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':

am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':

am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':

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

am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':

* commit 'd1439291d0a2d6558903205676d41410c319587e':
  Revert "Merge commit 'e887563a' into fix-merge-conclict"

am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':

am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '0e54db6b8ac292b4193a924176a939d4326e803b':

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