* commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':

* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':

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

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

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0

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

* commit '399cf8d641c0bad4cff016f3b1a02c63fb353a21':

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

* commit '8b5d62a4e819cb5114b294fc6754de63d50792b1':

* commit '7b4e8c78004c479ffc99ec7c677e206cfdf8b73c':

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

* commit 'e69eaa2230952424fd410f3378445e78fcf58242':

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

* commit '888cafe432fd2da8ae1b36429b5e8f822db11ce0':

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

* commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':

* commit 'f65ee555':

Change-Id: Ic1216c50b608f1609fd8a1a1a50209c4486f30a4

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

* commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':

am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':

* commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':

* commit '99c9801813fdc2eccd5db391c00d0250c327e344':

* commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':

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

* commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':

* commit 'e887563a':
  Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c

am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'd89b3060b40d8485d02e48d11056750495ecb577':

* commit '27243737cc739c25c8905cbe9b3040f500af127d':

* commit 'e8f7a71c113c692102115cf56071e7c24cf09c88':

* commit '286f57055b99aa2c3c107f4cd8f49eeace8db5b5':

* commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':

* commit 'f213b0c6a86503ad752139f04f343578df45db07':

* commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':

* commit '9141054bc24597968ddb94fb466c07cd2a933706':

* commit '5c3544dd69160dc00a7786977da220265a7c43c4':

Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38

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

* commit 'fa7bf363b9b46a933c3c3c81ff7f75684760fba8':

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

* commit '2c210bb92ce2001e943b107710ba098295a55761':

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

* commit '0ea6895484185194b405af7bacfd1c6a0590d17c':

* commit 'db4556edf20010913f977322d1544bec77c9c181':

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

* commit '649efad8ca2fd4a4770fddca4537b8a3d27be47c':

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

* commit 'aa721735628bd0affc98f3204729b39cceeb60d8':

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

* commit '2f8797132c9bca0235d4e937768625f432647d00':

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

* commit 'dee682fd34a78eb0335df215b72a7c5de6520170':