601 Commits (cd980d1c13c736b0f9fc453843f696a93c2c2a71)
 

Author SHA1 Message Date
Feng Xiao cd980d1c13 Prepare nano proto code to be merged into protobuf repository. 10 years ago
Dan Albert 6dc3924536 Merge "Add platform versions of the protobuf libraries." 10 years ago
Dan Albert 68e7e78257 Add platform versions of the protobuf libraries. 10 years ago
Behrooz Khorashadi e214da2663 am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data" 10 years ago
Behrooz Khorashadi 0b6a8f70fd Merge "Added an API method in FieldData to allow access to the UnknownField data" 10 years ago
Behrooz Khorashadi 5d6fc1921d Added an API method in FieldData to allow access to the UnknownField data 10 years ago
Jeff Davidson e4e7f3a25d am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts." 10 years ago
Jeff Davidson 59f2ff5856 Merge "Move protobuf 2.3.0 to prebuilts." 10 years ago
Jeff Davidson dac016786a Move protobuf 2.3.0 to prebuilts. 10 years ago
Brian Duff 4d6e9c5f6d am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode." 10 years ago
Brian Duff 188a2d6f5e Merge "Change reftypes_primitive_enums to reftypes_compat_mode." 10 years ago
Brian Duff 7fbf654004 Change reftypes_primitive_enums to reftypes_compat_mode. 10 years ago
Brian Duff 50a024fbe1 am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes." 10 years ago
Brian Duff 517591b8ea Merge "Adds a primitive enum mode for reftypes." 10 years ago
Brian Duff a892068c2d Adds a primitive enum mode for reftypes. 10 years ago
Brian Duff 7d8185c963 am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations." 10 years ago
Brian Duff 14e2f6cb37 Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations." 10 years ago
Jason Neufeld 87bd4029cf Includes a MessageNano subclass's name's hashCode in hashCode calculations. 10 years ago
Brian Duff 6c82acd0c8 am c4e7b92f: Merge "Make the tag field public." 10 years ago
Brian Duff e1458bba77 Merge "Make the tag field public." 10 years ago
Brian Duff 5a9b4501db Make the tag field public. 10 years ago
Brian Duff 5db346f1ef am ddf016d8: Merge "Add MessageNano.messageNanoEquals()." 10 years ago
Brian Duff 553d39f9d8 Merge "Add MessageNano.messageNanoEquals()." 10 years ago
Brian Duff 72881dad55 Add MessageNano.messageNanoEquals(). 10 years ago
Max Cai 80241687af am 0068978c: Merge "Fixed octal printing of bytearrays" 10 years ago
Max Cai 9d9cb7c330 Merge "Fixed octal printing of bytearrays" 10 years ago
Max Cai be60c85171 am 77866143: Merge "Revert "Fixed octal printing of bytearrays"" 10 years ago
Max Cai a609653bd3 am 238e0ac5: Merge "Fixed octal printing of bytearrays" 10 years ago
Linus Tufvesson 2d60e102fa Fixed octal printing of bytearrays 10 years ago
Max Cai 2b69e07cf3 Merge "Revert "Fixed octal printing of bytearrays"" 10 years ago
Max Cai 42da25e969 Revert "Fixed octal printing of bytearrays" 10 years ago
Max Cai 04f70ef5c7 Merge "Fixed octal printing of bytearrays" 10 years ago
Linus Tufvesson 32a45d0921 Fixed octal printing of bytearrays 10 years ago
Max Cai 274705a916 am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 10 years ago
Max Cai 1dad0f2307 am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 10 years ago
Ying Wang 08dd6049ee am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 10 years ago
Baligh Uddin c64af59b6f am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 10 years ago
Wink Saville 944f597185 am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 10 years ago
Wink Saville df60b2505d am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 10 years ago
Jan-Willem Maarse c430d41033 am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 10 years ago
Bill Yi c1a565c4d0 am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 10 years ago
Jeff Davidson d777adae82 am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 10 years ago
Max Cai 6745fbb9ea am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 10 years ago
Max Cai 2e738aa77c am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 10 years ago
Wink Saville fce0ffdf13 am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 10 years ago
Wink Saville 9378b718d1 am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 10 years ago
Max Cai dd49d0a1e9 am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 10 years ago
Max Cai e57ee765da am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 10 years ago
Ying Wang 11985d9b4e am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 10 years ago
Baligh Uddin 3d5bce541d am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 10 years ago