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

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

* commit 'a19dbf97df8416851dda1e01c5b27642d04e257a':

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

* commit 'e6780389313c3269c725a4f245bba4513ec6879c':

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

* commit '5a9d43b211ede37422ca16feb06fa6f04a450f18':

* commit 'c0bc136bb738812862d45b53f8546200741d558b':

am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':

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

* commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':

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

* commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':

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

* commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':

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

* commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':

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

* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':

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

* commit 'b2a7fc6b0585f3c53ea8110a8740141847f3394e':

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

* commit 'ab8cc07120d0fbb6ea4982459bc4238f0eea61bd':

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

* commit 'aa2afb0865fa9c15dcaf657d13c5144186548320':

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

* commit '6ed6b682a2b93135e3f5cffc7e7627b879354c82':

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

Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51

* commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf':
  You CANNOT change the global WITH_DEXPREOPT