 Max Cai
|
b930355a1e
am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
|
11 years ago |
|
Max Cai
|
3e9233a197
am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
|
11 years ago |
|
The Android Open Source Project
|
3942858d81
am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
|
11 years ago |
|
The Android Open Source Project
|
432b1b5e28
am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
|
11 years ago |
|
Max Cai
|
aad7f1d180
am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
|
11 years ago |
|
Max Cai
|
ed3f38f3d8
am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
|
11 years ago |
|
Max Cai
|
caa8cd3e0c
am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
|
11 years ago |
|
Max Cai
|
811349ad43
am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
|
11 years ago |
|
Max Cai
|
d582abfec3
am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
|
11 years ago |
|
Max Cai
|
a4193fb659
am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
|
11 years ago |
|
Max Cai
|
9360e76612
am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
|
11 years ago |
|
Max Cai
|
dd1856ef20
am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
|
11 years ago |
|
Max Cai
|
5120d06359
am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
|
11 years ago |
|
Max Cai
|
457861614f
am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
|
11 years ago |
|
Max Cai
|
bfe3289a11
am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
|
11 years ago |
|
Max Cai
|
5f851e79c3
am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
|
11 years ago |
|
Ulas Kirazci
|
e0dbffdeb6
am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
|
11 years ago |
|
Ulas Kirazci
|
357f6b779f
am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
|
11 years ago |
|
Wink Saville
|
f5392a8efe
am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
|
11 years ago |
|
Ulas Kirazci
|
e24507de07
am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
|
11 years ago |
|
Ulas Kirazci
|
603d3f5a73
am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
|
11 years ago |
|
Ulas Kirazci
|
a96e4fd7b8
am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
|
11 years ago |
|
Ulas Kirazci
|
f3e1090d18
am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
|
11 years ago |
|
Ulas Kirazci
|
9bb773f8c4
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
|
11 years ago |
|
Adam Metcalf
|
87f4899a90
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
|
11 years ago |
|
Wink Saville
|
50b34232c9
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
|
11 years ago |
|
Wink Saville
|
6e81fbbc16
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
11 years ago |
|
Wink Saville
|
feac014e7d
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
11 years ago |
|
Wink Saville
|
b5c235ccc2
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
|
11 years ago |
|
Wink Saville
|
e8e5707aee
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
|
11 years ago |
