472 Commits (c032a158173fd28a935f287afb1033fa6fdf9049)
 

Author SHA1 Message Date
Wink Saville 642f7003a7 Merge commit 'f65ee555' into fix-merge-conflict 11 years ago
Jan-Willem Maarse 9ad944e2d6 am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi e76c2cefee am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson a3d1a03fc1 am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai ba0ea9552f am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 78e5e83012 am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b05e2ffe0c am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago
Wink Saville 2666d4df51 Merge commit 'e887563a' into fix-merge-conclict 11 years ago
Wink Saville f812e7f2ca am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville bf2bb67903 am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" 11 years ago
Max Cai 42c481a7f5 am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." 11 years ago
Max Cai 83ed21fcb0 am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 11 years ago
Jie Dai 1e6f98066a am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp 11 years ago
Wink Saville 63bb1894f7 am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville e4f1a3457f am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" 11 years ago
Max Cai 915cddaa8a am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." 11 years ago
Max Cai 4def4b4501 am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 11 years ago
Jie Dai 9f4dda6d11 resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp 11 years ago
Max Cai 89197d0fdc am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." 11 years ago
Max Cai 1f0c9cdba5 am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." 11 years ago
Max Cai 6a64e5f6d6 am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." 11 years ago
Andrew Flynn ec730f99d2 am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" 11 years ago
Max Cai 3966be95cb am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." 11 years ago
Max Cai 4d5b68587a 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 65403dd030 am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD 11 years ago
The Android Open Source Project f87af7538f am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD 11 years ago
Max Cai 16890a2e3e am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." 11 years ago
Max Cai 07777ed7b1 am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." 11 years ago
Max Cai 44fb048cbd am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." 11 years ago
Max Cai f0b0553b43 am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." 11 years ago
Max Cai c1ebdc53be am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." 11 years ago
Max Cai ca3ee371df am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" 11 years ago
Max Cai a4d6044d4d am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." 11 years ago
Max Cai 407a507750 am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." 11 years ago
Max Cai 5377fe8d63 am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." 11 years ago
Max Cai a6d2dea6cb am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." 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 11 years ago
Max Cai 4091687400 am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." 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" 11 years ago
Ulas Kirazci 7a29ad789e am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." 11 years ago
Wink Saville 9d4ef46006 am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" 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." 11 years ago
Ulas Kirazci dee998a2ea am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." 11 years ago
Ulas Kirazci 4202251da0 am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." 11 years ago
Ulas Kirazci 0d7bc44bdf am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" 11 years ago
Ulas Kirazci 991282903e am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." 11 years ago
Adam Metcalf 3d365c953a am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 11 years ago
Wink Saville 1a4e9aadeb am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 11 years ago
Wink Saville e478ddd511 am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 648917d924 am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago