348 Commits (6e81fbbc16191faf8ffaf08bbc65a45e1ad671c0)
 

Author SHA1 Message Date
Wink Saville 6e81fbbc16 am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 10 years ago
Wink Saville feac014e7d am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 10 years ago
Wink Saville b5c235ccc2 am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 10 years ago
Wink Saville e8e5707aee am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 10 years ago
Ying Wang c89112387e am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 10 years ago
Ying Wang b18d5c1d43 am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin f5759da88c am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Ying Wang 82461de508 You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin 709cb7348e keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Qiwen Zhao 1d50c6b47c reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 11 years ago
Wink Saville d9b892d45b Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville fadc11055e Revert "Merge commit 'e887563a' into fix-merge-conclict" 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 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
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
Wink Saville 94d87e4398 am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 11 years ago
Wink Saville 583ccca8d5 am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 11 years ago
Max Cai e323701ace am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." 11 years ago
Max Cai 78544a3dbf am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." 11 years ago
Max Cai 6ceb306cca am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." 11 years ago
Andrew Flynn 8961fc07bd am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" 11 years ago
Max Cai 5e2d55d337 am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." 11 years ago
Max Cai 96d4c1cb83 am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" 11 years ago
The Android Open Source Project 69576a3408 am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD 11 years ago
The Android Open Source Project 689ea73912 am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD 11 years ago
Max Cai eb3871bcbd am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." 11 years ago
Max Cai 8e768270e9 am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." 11 years ago
Max Cai 1161744125 am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." 11 years ago
Max Cai 16d339f428 am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." 11 years ago
Max Cai aff0edcc22 am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." 11 years ago
Max Cai 493ac5bb15 am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." 11 years ago
Max Cai bd636aed71 am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" 11 years ago
Max Cai 11e2bf3bc2 am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." 11 years ago
Max Cai 525810e6d7 am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." 11 years ago
Max Cai 751cfd0c52 am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." 11 years ago
Max Cai 7da3e7591f am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge 11 years ago
Max Cai 1274ae6cf2 am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." 11 years ago
Ulas Kirazci 5b799a26e3 am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" 11 years ago
Ulas Kirazci 34d6051064 am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." 11 years ago