aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #91 from xfxyjwf/android_nanoFeng Xiao2014-11-2057-0/+15021
|\ \
| * | Fix the broken link at the bottom of javanano/README.txtFeng Xiao2014-11-201-1/+1
| * | Merge nano proto into protobuf repository.Feng Xiao2014-11-1957-0/+15021
| |\ \
| | * | Prepare nano proto code to be merged into protobuf repository.Feng Xiao2014-11-1946-394/+249
| | * | Merge "Add platform versions of the protobuf libraries."Dan Albert2014-11-111-0/+37
| | |\ \
| | | * | Add platform versions of the protobuf libraries.Dan Albert2014-11-111-0/+37
| | |/ /
| | * | am dbb9c303: Merge "Added an API method in FieldData to allow access to the U...Behrooz Khorashadi2014-11-061-0/+17
| | |\ \
| | | * \ Merge "Added an API method in FieldData to allow access to the UnknownField d...Behrooz Khorashadi2014-11-061-0/+17
| | | |\ \
| | | | * | Added an API method in FieldData to allow access to the UnknownField dataBehrooz Khorashadi2014-11-051-0/+17
| | | |/ /
| | * | | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-291-10/+13
| | |\| |
| | | * | Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-281-10/+13
| | | |\ \
| | | | * | Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-221-10/+13
| | | |/ /
| | * | | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-033-12/+31
| | |\| |
| | | * | Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-023-12/+31
| | | |\ \
| | | | * | Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| | | |/ /
| | * | | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | |\| |
| | | * | Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | | |\ \
| | | | * | Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| | | |/ /
| | * | | am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in ha...Brian Duff2014-09-171-0/+1
| | |\| |
| | | * | Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculat...Brian Duff2014-09-171-0/+1
| | | |\ \
| | | | * | Includes a MessageNano subclass's name's hashCode in hashCode calculations.Jason Neufeld2014-09-161-0/+1
| | | |/ /
| | * | | am c4e7b92f: Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
| | |\| |
| | | * | Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
| | | |\ \
| | | | * | Make the tag field public.Brian Duff2014-09-021-1/+1
| | | |/ /
| | * | | am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
| | |\| |
| | | * | Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
| | | |\ \
| | | | * | Add MessageNano.messageNanoEquals().Brian Duff2014-09-022-0/+29
| | | |/ /
| | * | | am 0068978c: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | |\| |
| | | * | Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | | |\ \
| | | | * | Fixed octal printing of bytearraysLinus Tufvesson2014-08-291-1/+1
| | | |/ /
| | * | | am 77866143: Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-291-1/+1
| | |\| |
| | | * | Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-281-1/+1
| | | |\ \
| | | | * | Revert "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
| | * | | | am 238e0ac5: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| | |\| | |
| | | * | | Merge "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
| | | |\| |
| | | | * | Fixed octal printing of bytearraysLinus Tufvesson2014-08-281-1/+1
| | | |/ /
| | * | | am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around ...Max Cai2014-08-210-0/+0
| | |\ \ \
| | | * \ \ am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldD...Max Cai2014-08-215-13/+33
| | | |\ \ \
| | | | * \ \ am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-215-13/+33
| | | | |\ \ \
| | * | | | | | am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to e...Max Cai2014-08-210-0/+0
| | |\| | | | |
| | | * | | | | am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension valu...Max Cai2014-08-217-253/+917
| | | |\| | | |
| | | | * | | | am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai2014-08-217-253/+917
| | | | |\ \ \ \
| | * | | | | | | am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT c...Ying Wang2014-08-210-0/+0
| | |\| | | | | |
| | | * | | | | | am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the glo...Ying Wang2014-08-210-0/+0
| | | |\| | | | |
| | | | * | | | | am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXP...Ying Wang2014-08-210-0/+0
| | | | |\ \ \ \ \
| | * | | | | | | | am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history...Baligh Uddin2014-08-210-0/+0
| | |\| | | | | | |
| | | * | | | | | | am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset ...Baligh Uddin2014-08-210-0/+0
| | | |\| | | | | |
| | | | * | | | | | am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5...Baligh Uddin2014-08-210-0/+0
| | | | |\ \ \ \ \ \
| | * | | | | | | | | am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge comm...Wink Saville2014-08-210-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a...Wink Saville2014-08-210-0/+0
| | | |\| | | | | | |