1. ffc8f5f am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" by Wink Saville · 10 years ago
  2. d0c2375 am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." by Max Cai · 10 years ago
  3. b331a49 am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f by Max Cai · 10 years ago
  4. 4f8d54c am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp by Jie Dai · 10 years ago
  5. 9d16f8a am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." by Max Cai · 10 years ago
  6. f5ef0e6 am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." by Max Cai · 10 years ago
  7. 2b50c9f am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." by Max Cai · 10 years ago
  8. 7f1f309 am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" by Andrew Flynn · 10 years ago
  9. b930355 am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." by Max Cai · 10 years ago
  10. 3e9233a am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" by Max Cai · 10 years ago
  11. 3942858 am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD by The Android Open Source Project · 10 years ago
  12. 432b1b5 am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD by The Android Open Source Project · 10 years ago
  13. aad7f1d am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." by Max Cai · 10 years ago
  14. ed3f38f am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." by Max Cai · 10 years ago
  15. caa8cd3 am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." by Max Cai · 10 years ago
  16. 811349a am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." by Max Cai · 10 years ago
  17. d582abf am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." by Max Cai · 10 years ago
  18. a4193fb am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." by Max Cai · 10 years ago
  19. 9360e76 am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" by Max Cai · 10 years ago
  20. dd1856e am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." by Max Cai · 10 years ago
  21. 5120d06 am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." by Max Cai · 10 years ago
  22. 4578616 am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." by Max Cai · 10 years ago
  23. bfe3289 am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge by Max Cai · 10 years ago
  24. 5f851e7 am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." by Max Cai · 10 years ago
  25. e0dbffd am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" by Ulas Kirazci · 10 years ago
  26. 357f6b7 am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." by Ulas Kirazci · 10 years ago
  27. f5392a8 am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" by Wink Saville · 10 years ago
  28. e24507d am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." by Ulas Kirazci · 10 years ago
  29. 603d3f5 am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." by Ulas Kirazci · 10 years ago
  30. a96e4fd am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." by Ulas Kirazci · 10 years ago
  31. f3e1090 am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" by Ulas Kirazci · 10 years ago
  32. 9bb773f am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." by Ulas Kirazci · 10 years ago
  33. 87f4899 am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. by Adam Metcalf · 10 years ago
  34. 50b3423 am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc by Wink Saville · 10 years ago
  35. 6e81fbb am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." by Wink Saville · 10 years ago
  36. feac014 am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 10 years ago
  37. b5c235c am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." by Wink Saville · 10 years ago
  38. e8e5707 am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 10 years ago
  39. c891123 am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" by Ying Wang · 10 years ago
  40. b18d5c1 am 8eed3705: You CANNOT change the global WITH_DEXPREOPT by Ying Wang · 10 years ago
  41. f5759da am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce by Baligh Uddin · 10 years ago
  42. 82461de You CANNOT change the global WITH_DEXPREOPT by Ying Wang · 11 years ago
  43. 709cb73 keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce by Baligh Uddin · 10 years ago
  44. 1d50c6b reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 by Qiwen Zhao · 11 years ago
  45. d9b892d Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp by Wink Saville · 11 years ago
  46. fadc110 Revert "Merge commit 'e887563a' into fix-merge-conclict" by Wink Saville · 11 years ago
  47. 9ad944e am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" by Jan-Willem Maarse · 11 years ago
  48. e76c2ce am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD by Bill Yi · 11 years ago
  49. a3d1a03 am 8113c186: resolved conflicts for merge of 592b6078 to master by Jeff Davidson · 11 years ago
  50. ba0ea95 am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" by Max Cai · 11 years ago
  51. 78e5e83 am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Max Cai · 11 years ago
  52. b05e2ff am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" by Wink Saville · 11 years ago
  53. 2666d4d Merge commit 'e887563a' into fix-merge-conclict by Wink Saville · 11 years ago
  54. bf2bb67 am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" by Wink Saville · 11 years ago
  55. 42c481a am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." by Max Cai · 11 years ago
  56. 83ed21f am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f by Max Cai · 11 years ago
  57. 1e6f980 am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp by Jie Dai · 11 years ago
  58. 63bb189 am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Wink Saville · 11 years ago
  59. e4f1a34 am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" by Wink Saville · 11 years ago
  60. 915cdda am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." by Max Cai · 11 years ago
  61. 4def4b4 am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f by Max Cai · 11 years ago
  62. 9f4dda6 resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp by Jie Dai · 11 years ago
  63. 89197d0 am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." by Max Cai · 11 years ago
  64. 1f0c9cd am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." by Max Cai · 11 years ago
  65. 6a64e5f am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." by Max Cai · 11 years ago
  66. ec730f9 am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" by Andrew Flynn · 11 years ago
  67. 3966be9 am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." by Max Cai · 11 years ago
  68. 4d5b685 am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" by Max Cai · 11 years ago
  69. 65403dd am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD by The Android Open Source Project · 11 years ago
  70. f87af75 am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD by The Android Open Source Project · 11 years ago
  71. 16890a2 am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." by Max Cai · 11 years ago
  72. 07777ed am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." by Max Cai · 11 years ago
  73. 44fb048 am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." by Max Cai · 11 years ago
  74. f0b0553 am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." by Max Cai · 11 years ago
  75. c1ebdc5 am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." by Max Cai · 11 years ago
  76. a4d6044 am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." by Max Cai · 11 years ago
  77. ca3ee37 am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" by Max Cai · 11 years ago
  78. 407a507 am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." by Max Cai · 11 years ago
  79. 5377fe8 am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." by Max Cai · 11 years ago
  80. a6d2dea am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." by Max Cai · 11 years ago
  81. 92ee2f0 am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge by Max Cai · 11 years ago
  82. 4091687 am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." by Max Cai · 11 years ago
  83. dbe4eda am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" by Ulas Kirazci · 11 years ago
  84. 7a29ad7 am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." by Ulas Kirazci · 11 years ago
  85. 9d4ef46 am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" by Wink Saville · 11 years ago
  86. e7eb156 am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." by Ulas Kirazci · 11 years ago
  87. dee998a am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." by Ulas Kirazci · 11 years ago
  88. 4202251 am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." by Ulas Kirazci · 11 years ago
  89. 0d7bc44 am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" by Ulas Kirazci · 11 years ago
  90. 9912829 am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." by Ulas Kirazci · 11 years ago
  91. 3d365c9 am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. by Adam Metcalf · 11 years ago
  92. 1a4e9aa am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc by Wink Saville · 11 years ago
  93. e478ddd am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." by Wink Saville · 11 years ago
  94. 648917d am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 11 years ago
  95. 94d87e4 am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." by Wink Saville · 11 years ago
  96. 583ccca am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 11 years ago
  97. e323701 am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." by Max Cai · 11 years ago
  98. 78544a3 am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." by Max Cai · 11 years ago
  99. 6ceb306 am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." by Max Cai · 11 years ago
  100. 8961fc0 am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" by Andrew Flynn · 11 years ago