aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Support generation of Parcelable nano messages."Jeff Davidson2014-04-2511-6/+454
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Support generation of Parcelable nano messages.Jeff Davidson2014-04-2511-6/+454
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Adds --ignore_service nano proto compiler flag"Max Cai2014-04-244-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adds --ignore_service nano proto compiler flagJie Dai2014-04-234-2/+21
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Don't reset cachedSize to 0 in getSerializedSize"Max Cai2014-04-145-9/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-04-105-9/+37
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""Wink Saville2014-03-225-41/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-41/+10
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-215-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-03-215-10/+41
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Fix compile error on mac 10.9"Wink Saville2014-02-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix compile error on mac 10.9Wink Saville2014-02-211-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Extension overhaul."Max Cai2014-02-1716-538/+1142
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Extension overhaul.Max Cai2014-01-1016-538/+1142
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge changes I9fecff3c,I2c1eb07fMax Cai2014-02-108-61/+315
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix repeated packed field merging code for non-packed data.Max Cai2014-01-162-9/+16
| * | | | | | | | | | Add validation when parsing enum fields.Max Cai2014-01-167-52/+299
|/ / / / / / / / / /
* | | | | | | | | | Merge "Allow whitespace in nano codegen options."Max Cai2014-01-144-31/+51
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Allow whitespace in nano codegen options.Max Cai2014-01-144-31/+51
|/ / / / / / / / /
* | | | | | | | | Merge "Correctness: floating point equality using bits instead of ==."Max Cai2014-01-134-50/+183
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Correctness: floating point equality using bits instead of ==.Max Cai2014-01-104-50/+183
* | | | | | | | | Merge "Don't serialize required fields whose 'has' flags are unset."Max Cai2014-01-134-6/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't serialize required fields whose 'has' flags are unset.Max Cai2014-01-104-6/+15
|/ / / / / / /
* | | | | | | Merge "Fix MessageNanoPrinter for accessors"Andrew Flynn2013-12-193-25/+102
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix MessageNanoPrinter for accessorsAndrew Flynn2013-12-123-25/+102
|/ / / / / /
* | | | | | Merge "Avoid class initializers to help ProGuard."Max Cai2013-12-1012-94/+248
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Avoid class initializers to help ProGuard.Max Cai2013-12-1012-94/+248
|/ / / / /
* | | | | Merge "Nano: don't generate accessor methods for nested methods"Max Cai2013-12-105-138/+53
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Nano: don't generate accessor methods for nested methodsAndrew Flynn2013-12-095-138/+53
| | |_|/ | |/| |
* | | | Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEADThe Android Open Source Project2013-12-050-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid Text...Max Cai2013-11-153-40/+84
| |\ \
| * \ \ am 332076f0: Merge "Fix warnings warnings in header files, hide others."Max Cai2013-11-153-6/+10
| |\ \ \
generated by cgit v1.1 at 2025-04-01 21:05:30 +0000