 Bill Yi
|
e76c2cefee
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
12 years ago |
|
Jeff Davidson
|
a3d1a03fc1
am 8113c186: resolved conflicts for merge of 592b6078 to master
|
12 years ago |
|
Max Cai
|
ba0ea9552f
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
|
12 years ago |
|
Max Cai
|
78e5e83012
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
12 years ago |
|
Wink Saville
|
b05e2ffe0c
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
|
12 years ago |
|
Wink Saville
|
2666d4df51
Merge commit 'e887563a' into fix-merge-conclict
|
12 years ago |
|
Wink Saville
|
63bb1894f7
am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
12 years ago |
|
Wink Saville
|
e4f1a3457f
am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
|
12 years ago |
|
Max Cai
|
915cddaa8a
am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
12 years ago |
|
Max Cai
|
4def4b4501
am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
|
12 years ago |
|
Jie Dai
|
9f4dda6d11
resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
|
12 years ago |
|
Max Cai
|
e323701ace
am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
|
12 years ago |
|
Max Cai
|
78544a3dbf
am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
|
12 years ago |
|
Max Cai
|
6ceb306cca
am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
|
12 years ago |
|
Andrew Flynn
|
8961fc07bd
am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
|
12 years ago |
|
Max Cai
|
5e2d55d337
am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
|
12 years ago |
|
Max Cai
|
96d4c1cb83
am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
|
12 years ago |
|
The Android Open Source Project
|
69576a3408
am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
|
12 years ago |
|
The Android Open Source Project
|
689ea73912
am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
|
12 years ago |
|
Max Cai
|
eb3871bcbd
am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
|
12 years ago |
|
Max Cai
|
8e768270e9
am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
|
12 years ago |
|
Max Cai
|
1161744125
am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
|
12 years ago |
|
Max Cai
|
16d339f428
am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
|
12 years ago |
|
Max Cai
|
aff0edcc22
am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
|
12 years ago |
|
Max Cai
|
493ac5bb15
am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
|
12 years ago |
|
Max Cai
|
bd636aed71
am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
|
12 years ago |
|
Max Cai
|
11e2bf3bc2
am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
|
12 years ago |
|
Max Cai
|
525810e6d7
am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
|
12 years ago |
|
Max Cai
|
751cfd0c52
am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
|
12 years ago |
|
Max Cai
|
7da3e7591f
am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
|
12 years ago |
