aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-15466-17934/+93818
* Merge "When no clear() is generated, still initialize fields."Brian Duff2015-01-094-12/+33
|\
| * When no clear() is generated, still initialize fields.Brian Duff2015-01-094-12/+33
* | Merge "Add clone() method support for nano."Brian Duff2015-01-0920-10/+213
|\ \
| * | Add clone() method support for nano.Brian Duff2015-01-0920-10/+213
|/ /
* | Merge "Fix comments."Brian Duff2015-01-081-2/+2
|\ \ | |/ |/|
| * Fix comments.Brian Duff2015-01-071-2/+2
|/
* Merge "Optimize measurement and serialization of nano protos."Brian Duff2015-01-072-28/+250
|\
| * Optimize measurement and serialization of nano protos.Charles Munger2015-01-072-28/+250
|/
* Merge "Fix bug with large extension field numbers."Brian Duff2015-01-063-9/+18
|\
| * Fix bug with large extension field numbers.Brian Duff2014-10-033-9/+18
* | 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-2927-10/+110
|\ \ \ | |/ /
| * | Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-2827-10/+110
| |\ \ | | |/ | |/|
| | * Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-2227-10/+110
| |/
* | 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-217-16/+36
| |\ \
| | * \ am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-217-16/+36
| | |\ \
* | | \ \ 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-218-256/+920
| |\ \ \ \ | | |/ / /
| | * | | am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai2014-08-218-256/+920
| | |\ \ \
* | | \ \ \ am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT c...Ying Wang2014-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / /