Max Cai
|
2e93315ba0
|
am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '2267616c6621b748c8551c9895e47a792ee04cb2':
|
2014-08-21 02:47:33 +00:00 |
|
Max Cai
|
d997452883
|
am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit '4b700b8a8b6ed8151aa22b99b2e0dac214e251f3':
|
2014-08-21 02:47:33 +00:00 |
|
Max Cai
|
31e0909c49
|
am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit '438ca4a840876afd43ac8cbea4df2130c0629072':
|
2014-08-21 02:47:32 +00:00 |
|
Max Cai
|
09592e05e9
|
am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit '17395e556af77b06ea3de454d5c279802ec8cc49':
|
2014-08-21 02:47:32 +00:00 |
|
Max Cai
|
c032a15817
|
am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit '826b4cf541f3d21f374e2749c48348c6539c6b2e':
|
2014-08-21 02:47:31 +00:00 |
|
Max Cai
|
15167d6f58
|
am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':
|
2014-08-21 02:47:31 +00:00 |
|
Max Cai
|
789d9b94e9
|
am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit '03016e747254a97144db2703106787b493fb5014':
|
2014-08-21 02:47:30 +00:00 |
|
Max Cai
|
dfa03c1f20
|
am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'fa0eb541ce7abf79b1bf7ba5526d3418d74657ab':
|
2014-08-21 02:47:30 +00:00 |
|
Max Cai
|
b4948d7e03
|
am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':
|
2014-08-21 02:47:29 +00:00 |
|
Max Cai
|
106ab9f855
|
am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'a61b2ef1d7b372b858b6aae07cf3eebbf62184b8':
|
2014-08-21 02:47:29 +00:00 |
|
Ulas Kirazci
|
6173389c74
|
am 056670c9: 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 '056670c92d2a1420accbb07e636b895d925df2a1':
|
2014-08-21 02:47:28 +00:00 |
|
Ulas Kirazci
|
6172b92ec9
|
am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit '73789372578a45ceae125e2f66254988ac7eed73':
|
2014-08-21 02:47:27 +00:00 |
|
Wink Saville
|
72d1e4c1de
|
am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit '8973d9e63f9f972d646b07719d9292752e3aa382':
|
2014-08-21 02:47:27 +00:00 |
|
Ulas Kirazci
|
7d207bb141
|
am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
* commit 'd8fbc18826e4945c45b22b5d36d5e07deb08bf0a':
|
2014-08-21 02:47:26 +00:00 |
|
Ulas Kirazci
|
4adac19858
|
am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit '8877603f0c61a959ef667df563429589f3a71cc0':
|
2014-08-21 02:47:26 +00:00 |
|
Ulas Kirazci
|
e984f5ac1b
|
am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':
|
2014-08-21 02:47:25 +00:00 |
|
Ulas Kirazci
|
e1368404c2
|
am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':
|
2014-08-21 02:47:24 +00:00 |
|
Ulas Kirazci
|
c76c4672f6
|
am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':
|
2014-08-21 02:47:24 +00:00 |
|
Adam Metcalf
|
4d0809c712
|
am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':
|
2014-08-21 02:47:23 +00:00 |
|
Wink Saville
|
628e245da3
|
am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
|
2014-08-21 02:47:22 +00:00 |
|
Wink Saville
|
64b1c7780b
|
am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':
|
2014-08-21 02:47:21 +00:00 |
|
Wink Saville
|
bf6b7cb8f7
|
am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':
|
2014-08-21 02:47:20 +00:00 |
|
Wink Saville
|
07c34fa29b
|
am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':
|
2014-08-21 02:47:20 +00:00 |
|
Wink Saville
|
052abeef0c
|
am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit 'a94fe6cb54165b8139b719f287cdad4973f93643':
|
2014-08-21 02:47:19 +00:00 |
|
Ying Wang
|
0f91148556
|
am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'b09fd32de981b889f973de772a696cef47162ebf':
|
2014-08-21 02:47:17 +00:00 |
|
Max Cai
|
e0f145b623
|
am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '8948d605872d310771d1e9e73669778660a6b787':
|
2014-08-20 20:58:06 +00:00 |
|
Max Cai
|
caf14f7076
|
am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit 'dce52afd8eb043950cbfac7e057362918159b07f':
|
2014-08-20 20:57:57 +00:00 |
|
Max Cai
|
22ba1f6ef2
|
am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':
|
2014-08-20 20:57:57 +00:00 |
|
Max Cai
|
3e2d499eba
|
am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit 'e668f0c3a996574010b60daa74823bfa9429dcda':
|
2014-08-20 20:57:57 +00:00 |
|
Max Cai
|
d86fe313e1
|
am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit '74b536a558743acacb10e00aced05e59249a76bc':
|
2014-08-20 20:57:56 +00:00 |
|
Max Cai
|
894827d9eb
|
am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':
|
2014-08-20 20:57:56 +00:00 |
|
Max Cai
|
ee90593b59
|
am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':
|
2014-08-20 20:57:55 +00:00 |
|
Max Cai
|
ee9e51a962
|
am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'bd188bc73c8d0f6214192b66780764cf4315530e':
|
2014-08-20 20:57:54 +00:00 |
|
Max Cai
|
1eda7ff145
|
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':
|
2014-08-20 20:57:54 +00:00 |
|
Max Cai
|
80ac912235
|
am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'e90564050f017e6e5d78ed5328c21a2b445e1122':
|
2014-08-20 20:57:53 +00:00 |
|
Ulas Kirazci
|
53ee7a08a3
|
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':
|
2014-08-20 20:57:52 +00:00 |
|
Ulas Kirazci
|
0f1f87237f
|
am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit '8d2f4cf7214e1c6c2df85212cfbbd8859e04203a':
|
2014-08-20 20:57:51 +00:00 |
|
Wink Saville
|
47a794dfb8
|
am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit 'c6ec950e9cc24aed39c2e6ba70b2760407b9d186':
|
2014-08-20 20:57:50 +00:00 |
|
Ulas Kirazci
|
7b7373ec45
|
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':
|
2014-08-20 20:57:49 +00:00 |
|
Ulas Kirazci
|
14db565fa3
|
am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit '2b2d73d26843cf178a1f23f30472934060194519':
|
2014-08-20 20:57:48 +00:00 |
|
Ulas Kirazci
|
c6db485c44
|
am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'a19dbf97df8416851dda1e01c5b27642d04e257a':
|
2014-08-20 20:57:48 +00:00 |
|
Ulas Kirazci
|
a321b31f29
|
am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit 'e6780389313c3269c725a4f245bba4513ec6879c':
|
2014-08-20 20:57:47 +00:00 |
|
Ulas Kirazci
|
6ea7791860
|
am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit '5a9d43b211ede37422ca16feb06fa6f04a450f18':
|
2014-08-20 20:57:46 +00:00 |
|
Adam Metcalf
|
a4a0dbf44e
|
am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit 'c0bc136bb738812862d45b53f8546200741d558b':
|
2014-08-20 20:57:46 +00:00 |
|
Wink Saville
|
40a85d0678
|
am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':
|
2014-08-20 20:57:45 +00:00 |
|
Wink Saville
|
9d07847a87
|
am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':
|
2014-08-20 20:57:45 +00:00 |
|
Wink Saville
|
f3223cd16e
|
am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':
|
2014-08-20 20:57:44 +00:00 |
|
Wink Saville
|
28448e6ef2
|
am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':
|
2014-08-20 20:57:44 +00:00 |
|
Wink Saville
|
c5a596db72
|
am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':
|
2014-08-20 20:57:43 +00:00 |
|
Ying Wang
|
5c53e89aeb
|
am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':
|
2014-08-20 20:57:39 +00:00 |
|