Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / protobuf / refs/heads/fp2-sibon-2.0.1
  1. c6d612a am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." by Max Cai · 10 years ago fp2-sibon fp2-sibon-2.0.1 fp2-sibon-2.0.2 FP2-open-16.05.0 FP2-open-16.06.0 FP2-open-16.07.1 FP2-open-16.08.0 FP2-open-16.09.0 FP2-open-16.10.0 FP2-open-16.11.0 FP2-open-16.12.0 FP2-open-17.01.0 FP2-open-17.04.0
  2. b172d66 am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." by Max Cai · 10 years ago
  3. e9d2557 am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT by Ying Wang · 10 years ago
  4. b088989 am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce by Baligh Uddin · 10 years ago
  5. b38ef83 am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp by Wink Saville · 10 years ago
  6. 8add996 am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" by Wink Saville · 10 years ago
  7. 1944e19 am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" by Jan-Willem Maarse · 10 years ago
  8. 7f3f30e am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD by Bill Yi · 10 years ago
  9. 7bf5872 am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master by Jeff Davidson · 10 years ago
  10. ee16014 am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" by Max Cai · 10 years ago
  11. 2b46999 am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Max Cai · 10 years ago
  12. dc94687 am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" by Wink Saville · 10 years ago
  13. 9160bc6 am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict by Wink Saville · 10 years ago
  14. ecb2c88 am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." by Max Cai · 10 years ago
  15. 2e6d4ae am f39998c2: am daf63839: Merge "Keep pointers to extension values." by Max Cai · 10 years ago
  16. cca3823 am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT by Ying Wang · 10 years ago
  17. 57e2ee7 am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce by Baligh Uddin · 10 years ago
  18. 1f89137 am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp by Wink Saville · 10 years ago
  19. f13aadf am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" by Wink Saville · 10 years ago
  20. a3ab436 am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" by Jan-Willem Maarse · 10 years ago
  21. d0f3ba6 am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD by Bill Yi · 10 years ago
  22. 3656cc2 am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master by Jeff Davidson · 10 years ago
  23. f613f9e am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" by Max Cai · 10 years ago
  24. 61317c3 am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Max Cai · 10 years ago
  25. 6eb7a51 am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" by Wink Saville · 10 years ago
  26. 390b6c4 am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict by Wink Saville · 10 years ago
  27. 89f0407 am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Wink Saville · 10 years ago
  28. b28d173 am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" by Wink Saville · 10 years ago
  29. 339f5a6 am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." by Max Cai · 10 years ago
  30. 34559f8 am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f by Max Cai · 10 years ago
  31. 6f45464 am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp by Jie Dai · 10 years ago
  32. cb39544 am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." by Max Cai · 10 years ago
  33. c1d044c am d043ff9d: 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
  34. ddf77b1 am b22123d1: 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
  35. a155ce7 am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" by Andrew Flynn · 10 years ago
  36. dad271e am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." by Max Cai · 10 years ago
  37. 3a32451 am 01d1cdeb: 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
  38. 8d5b7fb am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD by The Android Open Source Project · 10 years ago
  39. 6d879b4 am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD by The Android Open Source Project · 10 years ago
  40. a59cc53 am c0bffb62: 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
  41. 9b07838 am 6ca2db13: 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
  42. 2267616 am 8948d605: 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
  43. 4b700b8 am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." by Max Cai · 10 years ago
  44. 438ca4a am f1c5cd09: 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
  45. 17395e5 am e668f0c3: 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
  46. 826b4cf am 74b536a5: 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
  47. 3c4cfda am 80fe1808: 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
  48. 03016e7 am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." by Max Cai · 10 years ago
  49. fa0eb54 am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." by Max Cai · 10 years ago
  50. eaac3e7 am 4734b989: 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
  51. a61b2ef am e9056405: 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
  52. 056670c am e655a862: 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
  53. 7378937 am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." by Ulas Kirazci · 10 years ago
  54. 8973d9e am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" by Wink Saville · 10 years ago
  55. d8fbc18 am b42d5107: 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
  56. 8877603 am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." by Ulas Kirazci · 10 years ago
  57. dde8a69 am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." by Ulas Kirazci · 10 years ago
  58. 54ad71f am e6780389: 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
  59. 242aa18 am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." by Ulas Kirazci · 10 years ago
  60. cd22086 am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. by Adam Metcalf · 10 years ago
  61. aa2e7e5 am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc by Wink Saville · 10 years ago
  62. ed67cd7 am d801ea90: 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
  63. 1c524da am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 10 years ago
  64. 3c00157 am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." by Wink Saville · 10 years ago
  65. a94fe6c am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." by Wink Saville · 10 years ago
  66. b09fd32 am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" by Ying Wang · 10 years ago
  67. 232698c am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" by Wink Saville · 10 years ago
  68. 0cb1a2f am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" by Wink Saville · 10 years ago
  69. 67584f4 am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." by Max Cai · 10 years ago
  70. 1b9cb7b am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f by Max Cai · 10 years ago
  71. 1af058a am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp by Jie Dai · 10 years ago
  72. 5843426 am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." by Max Cai · 10 years ago
  73. d043ff9 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
  74. b22123d 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
  75. 3628a85 am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" by Andrew Flynn · 10 years ago
  76. a6ee3ba am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." by Max Cai · 10 years ago
  77. 01d1cde 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
  78. 23b6675 am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD by The Android Open Source Project · 10 years ago
  79. e747813 am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD by The Android Open Source Project · 10 years ago
  80. c0bffb6 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
  81. 6ca2db1 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
  82. 8948d60 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
  83. dce52af am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." by Max Cai · 10 years ago
  84. f1c5cd0 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
  85. e668f0c 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
  86. 74b536a 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
  87. 80fe180 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
  88. 2cb17b1 am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." by Max Cai · 10 years ago
  89. bd188bc am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." by Max Cai · 10 years ago
  90. 4734b98 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
  91. e905640 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
  92. e655a86 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
  93. 8d2f4cf am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." by Ulas Kirazci · 10 years ago
  94. c6ec950 am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" by Wink Saville · 10 years ago
  95. b42d510 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
  96. 2b2d73d am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." by Ulas Kirazci · 10 years ago
  97. a19dbf9 am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." by Ulas Kirazci · 10 years ago
  98. e678038 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
  99. 5a9d43b am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." by Ulas Kirazci · 10 years ago
  100. c0bc136 am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. by Adam Metcalf · 10 years ago