aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix bug with large extension field numbers.Brian Duff2014-10-033-9/+18
* 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
|/
* 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
|/
* 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
|/
* Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
|\
| * Make the tag field public.Brian Duff2014-09-021-1/+1
|/
* Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
|\
| * Add MessageNano.messageNanoEquals().Brian Duff2014-09-022-0/+29
|/
* Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
|\
| * Fixed octal printing of bytearraysLinus Tufvesson2014-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
* | Merge "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
|\ \ | |/
| * Fixed octal printing of bytearraysLinus Tufvesson2014-08-281-1/+1
|/
* Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2014-08-051-5/+1
|\
| * Fix how getRepeatedFieldArrayLength worksMax Cai2014-07-031-5/+1
* | Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-292-1/+5
|\ \
| * | Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-282-1/+5
|/ /
* | Merge "Don't return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-211-4/+4
|\ \
| * | Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
|/ /
* | Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-172-2/+69
|\ \
| * | Add a hasExtension method to ExtendableMessageNano.Juan Silveira2014-07-172-2/+69
|/ /
* | Merge "Fix access around unknownFieldData."Max Cai2014-07-147-16/+36
|\ \
| * | Fix access around unknownFieldData.Max Cai2014-07-157-16/+36
|/ /
* | Merge "Keep pointers to extension values."Max Cai2014-07-148-256/+920
|\ \ | |/ |/|
| * Keep pointers to extension values.Juan Silveira2014-07-148-256/+920
|/
* am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"Ying Wang2014-05-021-1/+1
|\
| * Merge "You CANNOT change the global WITH_DEXPREOPT"Ying Wang2014-05-021-1/+1
| |\
| | * You CANNOT change the global WITH_DEXPREOPTYing Wang2014-05-011-1/+1
* | | am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"Jan-Willem Maarse2014-05-012-1/+15
|\ \ \ | |/ /
| * | Merge "Fix NPE when clearing an extension in nano protos"Jan-Willem Maarse2014-05-012-1/+15
| |\ \ | | |/ | |/|
| | * Fix NPE when clearing an extension in nano protosJan-Willem Maarse2014-05-012-1/+15
| |/
* | Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEADBill Yi2014-04-290-0/+0
|\ \ | |/ |/|
| * am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""Wink Saville2014-03-225-41/+10
| |\
| * \ am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-10/+41
| |\ \
| * \ \ am 51ef8f39: Merge "Fix compile error on mac 10.9"Wink Saville2014-03-081-0/+1
| |\ \ \
| * \ \ \ am afc1553a: Merge "Extension overhaul."Max Cai2014-03-0716-538/+1142
| |\ \ \ \
| * \ \ \ \ am 447f664a: Merge changes I9fecff3c,I2c1eb07fMax Cai2014-03-078-61/+315
| |\ \ \ \ \
| * \ \ \ \ \ am a8af729b: Merge "Allow whitespace in nano codegen options."Max Cai2014-01-144-31/+51
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 4b5874fa: Merge "Correctness: floating point equality using bits instead o...Max Cai2014-01-134-50/+183
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are ...Max Cai2014-01-134-6/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am e7741c06: Merge "Fix MessageNanoPrinter for accessors"Andrew Flynn2013-12-193-25/+102
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 3f9bd998: Merge "Avoid class initializers to help ProGuard."Max Cai2013-12-1012-94/+248
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"Max Cai2013-12-105-138/+53
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fi...Max Cai2013-11-2111-106/+326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \