Max Cai
|
c1ebdc53be
|
am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit 'd734d52f6ae689cd6efb768383056b5fb7ef3320':
|
11 years ago |
Max Cai
|
a4d6044d4d
|
am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit '92d0bd2567355384de6c1b0f2662f6d0c0a94707':
|
11 years ago |
Max Cai
|
ca3ee371df
|
am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit 'fc9db907250a8d8f3e60ba57d8073a6ca8169d36':
|
11 years ago |
Max Cai
|
407a507750
|
am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '6988e26be6d502789e7c1bed36e72873546d223a':
|
11 years ago |
Max Cai
|
5377fe8d63
|
am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit 'f97b9cedc0160a0c13ba18467b8b3b38746b64bb':
|
11 years ago |
Max Cai
|
a6d2dea6cb
|
am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'e4bf716d77655a9434de44442663682f2ba5fbc1':
|
11 years ago |
Max Cai
|
92ee2f0ea8
|
am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit 'caf351056c6ce99dd4000003d84774ad953877fe':
|
11 years ago |
Max Cai
|
4091687400
|
am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'f593c0a51e5c901f9aa9d18857765f464808afee':
|
11 years ago |
Ulas Kirazci
|
dbe4eda3b7
|
am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
* commit '4dfa34e224c3d961c0d84e3a3b848f01e55d746c':
|
11 years ago |
Ulas Kirazci
|
7a29ad789e
|
am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit '90e065ddd7c3a620ee4f6160bf1227fdfe57a63f':
|
11 years ago |
Wink Saville
|
9d4ef46006
|
am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':
|
11 years ago |
Ulas Kirazci
|
e7eb156549
|
am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':
|
11 years ago |
Ulas Kirazci
|
dee998a2ea
|
am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':
|
11 years ago |
Ulas Kirazci
|
4202251da0
|
am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'a5df326138cdaf4874026c09e2967d8142eca811':
|
11 years ago |
Ulas Kirazci
|
0d7bc44bdf
|
am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit '194529f1952e4d873c8262e09a40ac71872859d2':
|
11 years ago |
Ulas Kirazci
|
991282903e
|
am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit '8c131d5bf75499455ce287aeb0af30030282a000':
|
11 years ago |
Adam Metcalf
|
3d365c953a
|
am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit '4104f751dbabfc2dd04adee381aa4d949f81dbe1':
|
11 years ago |
Wink Saville
|
1a4e9aadeb
|
am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit '662d2f44e91af91a37a59f1fe1697a00b6b724c9':
|
11 years ago |
Wink Saville
|
e478ddd511
|
am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':
|
11 years ago |
Wink Saville
|
648917d924
|
am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '7022c115663ac6e24afdc896fc6f155f1a9bc52c':
|
11 years ago |
Wink Saville
|
94d87e4398
|
am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'efa53b19f45400ca98c1bb2dc1f5bfa87be033df':
|
11 years ago |
Wink Saville
|
583ccca8d5
|
am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '211bb9125a78b3b8772afc196e16640a8b7f2f7b':
|
11 years ago |
Max Cai
|
aff0edcc22
|
am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit '8eda9d3f991c62237a24e4d9f8e7f58df1687a86':
|
11 years ago |
Max Cai
|
493ac5bb15
|
am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit 'e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe':
|
11 years ago |
Max Cai
|
bd636aed71
|
am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit '0610e6834fa213c026d91fab037a649613840f44':
|
11 years ago |
Max Cai
|
11e2bf3bc2
|
am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '4b359335e94c44fa16b78c1406f3cd71b7fbf40b':
|
11 years ago |
Max Cai
|
525810e6d7
|
am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit '677d51bb86ca57654617dae9fe645995a1b22658':
|
11 years ago |
Max Cai
|
751cfd0c52
|
am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit '8f903e123aff94f272aaae22e275924980433a47':
|
11 years ago |
Max Cai
|
7da3e7591f
|
am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit '0e5add1dd4a5ce73ff10b38307bae942be178d5b':
|
11 years ago |
Max Cai
|
1274ae6cf2
|
am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'ee8847c131e91c718a0f4d2af73ec56d9fd24d81':
|
11 years ago |
Ulas Kirazci
|
5b799a26e3
|
am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
* commit 'dc8f4a8bc871cf1ba6a27eaf7f581a144571411a':
|
11 years ago |
Ulas Kirazci
|
34d6051064
|
am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit 'ca07ad9d617b3ebab5d66077413bdfc7673a2926':
|
11 years ago |
Wink Saville
|
2e58634a11
|
am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':
|
11 years ago |
Ulas Kirazci
|
d8e4681030
|
am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
* commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':
|
11 years ago |
Ulas Kirazci
|
9865277597
|
am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':
|
11 years ago |
Ulas Kirazci
|
80e4a3466f
|
am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':
|
11 years ago |
Ulas Kirazci
|
1eb488bc32
|
am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit '6778e0a0198f602cab76daf6428a97292007dc71':
|
11 years ago |
Ulas Kirazci
|
1724ed4d4e
|
am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':
|
11 years ago |
Adam Metcalf
|
51d87cc588
|
am 380d1b5a: Fix the merge conflict leftovers.
* commit '380d1b5a78de07a081b36c890321ac61a0fced1a':
Fix the merge conflict leftovers.
|
11 years ago |
Wink Saville
|
5486adb7d2
|
am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':
|
11 years ago |
Wink Saville
|
fb594ee1ec
|
am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':
|
11 years ago |
Wink Saville
|
990a4753dc
|
am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit 'ba363f1380e9b99e6606462b21febd2e4027e340':
|
11 years ago |
Wink Saville
|
5534cede6e
|
am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '4d7f9ad71771fff628e88d463af94b44457b7934':
|
11 years ago |
Wink Saville
|
5a2be75cb2
|
am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit 'f105476adedac50be509ed36cbb187b92fca54d9':
|
11 years ago |
Ying Wang
|
e251c9eb81
|
am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1':
You CANNOT change the global WITH_DEXPREOPT
|
11 years ago |
Ying Wang
|
efd4ae404f
|
am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '94f522f907e3f34f70d9e7816b947e62fddbb267':
You CANNOT change the global WITH_DEXPREOPT
|
11 years ago |
Ying Wang
|
70ef74aaa6
|
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '49512cb01065b41c0113248c2c02800de1156d50':
You CANNOT change the global WITH_DEXPREOPT
|
11 years ago |
Ying Wang
|
b54018a23c
|
Merge "You CANNOT change the global WITH_DEXPREOPT"
|
11 years ago |
Ying Wang
|
d75027090c
|
You CANNOT change the global WITH_DEXPREOPT
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
|
11 years ago |
Jan-Willem Maarse
|
42470ba6e0
|
am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
* commit '70eec2cabb5fa7bf8d7d492ec46905dae3df5a76':
Fix NPE when clearing an extension in nano protos
|
11 years ago |