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

* commit 'f7bbfdfd53b1fbe0073eaa2b132d358edae2b545':

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

* commit 'ea95349d36ad1894fd68b23b04bc9a6422adeeb0':

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

* commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':

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

* commit 'a6ddccbbac403dbe6fce5623768755c08d41c962':

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

* commit 'a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c':

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

* commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':

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

* commit '998ea484ba19563fd32ba3e2e16e785f449afa74':

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

* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':

* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':

* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':

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

* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':

am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':

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

* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':

am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':

am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':

* commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
  You CANNOT change the global WITH_DEXPREOPT

* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0

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

* commit 'f213b0c6a86503ad752139f04f343578df45db07':

* commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':

* commit '9141054bc24597968ddb94fb466c07cd2a933706':

* commit '5c3544dd69160dc00a7786977da220265a7c43c4':

Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38

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

* commit '4dfa34e224c3d961c0d84e3a3b848f01e55d746c':

* commit '90e065ddd7c3a620ee4f6160bf1227fdfe57a63f':

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

* commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':

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

* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':

* commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':

* commit 'a5df326138cdaf4874026c09e2967d8142eca811':