472 Commits (c032a158173fd28a935f287afb1033fa6fdf9049)
 

Author SHA1 Message Date
Wink Saville f5392a8efe am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" 10 years ago
Ulas Kirazci e24507de07 am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." 10 years ago
Ulas Kirazci 603d3f5a73 am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." 10 years ago
Ulas Kirazci a96e4fd7b8 am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." 10 years ago
Ulas Kirazci f3e1090d18 am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" 10 years ago
Ulas Kirazci 9bb773f8c4 am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." 10 years ago
Adam Metcalf 87f4899a90 am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 10 years ago
Wink Saville 50b34232c9 am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 10 years ago
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
Max Cai 4be139dcd8 am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works" 10 years ago
Sam Hasinoff 33824b0f1b am f91b7fa1: Fix build, by using external/zlib instead of system zlib 10 years ago
Sam Hasinoff 333c46cd1d Fix build, by using external/zlib instead of system zlib 10 years ago
Max Cai ec0e1c00e0 Merge "Fix how getRepeatedFieldArrayLength works" 10 years ago
Leandro Gracia Gil 985cc6a74e am 4d11e705: Merge "Fix the aprotoc target for Windows." 10 years ago
Leandro Gracia Gil a174231837 Merge "Fix the aprotoc target for Windows." 10 years ago
Leandro Gracia Gil b596f9c7b4 Fix the aprotoc target for Windows. 10 years ago
Brian Duff c390fe3eb3 am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName." 11 years ago
Brian Duff 23c5978a76 Merge "Don't return NULL from {Boxed}PrimitiveTypeName." 11 years ago
Brian Duff 7acc0f831f Don't return NULL from {Boxed}PrimitiveTypeName. 11 years ago
Max Cai a481ed8269 am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
Max Cai 2a5f3f97a0 Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
Juan Silveira c052b50388 Add a hasExtension method to ExtendableMessageNano. 11 years ago
Max Cai 2e91cf4f68 am a88808d4: Merge "Fix access around unknownFieldData." 11 years ago
Max Cai 9c2d63c8d3 am daf63839: Merge "Keep pointers to extension values." 11 years ago
Max Cai 30b1454d8b Merge "Keep pointers to extension values." 11 years ago
Max Cai 7a83d3482a Merge "Fix access around unknownFieldData." 11 years ago
Max Cai d1a8a8f6f1 Fix access around unknownFieldData. 11 years ago
Juan Silveira 79f19eb9f1 Keep pointers to extension values. 11 years ago
Max Cai 9ceb3d4acc Fix how getRepeatedFieldArrayLength works 11 years ago
Ying Wang 30cd2a4a98 am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin c7213e1c39 am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 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 9db6d437df am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville 3b0952fb80 Revert "Merge commit 'e887563a' into fix-merge-conclict" 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 9a58c6f56c am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi ef5fd0e053 am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson be8aadfd3b am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai 8b6445a019 am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 8624f47bab am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b67c3fa484 am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago