aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ff882b40: Merge "Generate a CREATOR for each Parcelable message."Jeff Davidson2015-04-064-36/+34
|\
| * Merge "Generate a CREATOR for each Parcelable message."Jeff Davidson2015-04-064-36/+34
| |\
| | * Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-034-36/+34
| |/
* | am 00c7607c: Merge "Inline unknownFieldData{Equals,HashCode} to generated code."Brian Duff2015-03-203-35/+19
|\ \ | |/
| * Merge "Inline unknownFieldData{Equals,HashCode} to generated code."Brian Duff2015-03-203-35/+19
| |\
| | * Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-03-203-35/+19
| |/
* | am 51e32ffa: Merge "Expose generate_clear as an option."Brian Duff2015-03-201-0/+2
|\ \ | |/
| * Merge "Expose generate_clear as an option."Brian Duff2015-03-201-0/+2
| |\
| | * Expose generate_clear as an option.Brian Duff2015-02-211-0/+2
* | | am 182e6d05: Merge "Added a build rule for the full version of the protocol b...P.Y. Laligand2015-03-121-0/+17
|\ \ \ | |/ /
| * | Merge "Added a build rule for the full version of the protocol buffer library."P.Y. Laligand2015-03-121-0/+17
| |\ \
| | * | Added a build rule for the full version of the protocol buffer library.P.Y. Laligand2015-03-111-0/+17
| |/ /
* | | am ba4c97c2: Merge commit \'7304898f86cd6b2e525772e9cda4ba686b7d3fd2\' into HEADBill Yi2015-02-200-0/+0
|\ \ \ | |/ /
| * | Merge commit '7304898f86cd6b2e525772e9cda4ba686b7d3fd2' into HEADBill Yi2015-02-191-0/+13
| |\ \ | | |/ | |/|
* | | am 72b0f4cf: Merge "Generate @IntDef annotations for nanoproto enums."Jeff Davidson2015-02-196-11/+98
|\ \ \ | |/ /
| * | Merge "Generate @IntDef annotations for nanoproto enums."Jeff Davidson2015-02-196-11/+98
| |\ \
| | * | Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-02-196-11/+98
* | | | am 971aedc7: Merge "Add reset() and position() to CodedOutputByteBufferNano."Brian Duff2015-02-171-0/+17
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Add reset() and position() to CodedOutputByteBufferNano."Brian Duff2015-02-171-0/+17
| |\ \ | | |/ | |/|
| | * Add reset() and position() to CodedOutputByteBufferNano.Shai Barack2015-02-171-0/+17
| |/
* | am 46fe64be: DO NOT MERGE Overloading createMessageTyped to accept a tag as a...Kweku Adams2015-02-111-0/+13
|\ \
| * | DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.Kweku Adams2015-02-101-0/+13
* | | am aecce146: (-s ours) DO NOT MERGE Fix bug with large extension field numbers.Brian Duff2015-02-110-0/+0
|\ \ \ | |/ /
| * | DO NOT MERGE Fix bug with large extension field numbers.Brian Duff2015-02-103-9/+18
* | | am eb5ae9e2: Merge "Use libstdc++, not libc++_static, with protobuf."Jeff Davidson2015-02-061-2/+2
|\ \ \ | | |/ | |/|
| * | Merge "Use libstdc++, not libc++_static, with protobuf."Jeff Davidson2015-02-061-2/+2
| |\ \
| | * | Use libstdc++, not libc++_static, with protobuf.Jeff Davidson2015-02-061-2/+2
| |/ /
* | | am f2982dd2: Merge "Include libc++ statically in aprotoc."Jeff Davidson2015-02-061-0/+4
|\ \ \ | |/ /
| * | Merge "Include libc++ statically in aprotoc."Jeff Davidson2015-02-061-0/+4
| |\ \
| | * | Include libc++ statically in aprotoc.Jeff Davidson2015-02-061-0/+4
| |/ /
* | | am 1c2c4706: Merge "Exclude cachedSize when printing fields."Brian Duff2015-01-221-0/+4
|\ \ \ | |/ /
| * | Merge "Exclude cachedSize when printing fields."Brian Duff2015-01-221-0/+4
| |\ \
| | * | Exclude cachedSize when printing fields.Brian Duff2015-01-221-0/+4
| |/ /
* | | am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."Jeff Davidson2015-01-22410-476/+897
|\ \ \ | |/ /
| * | Merge "Upgrade protobuf library to v2.6.1."Jeff Davidson2015-01-21410-476/+897
| |\ \
| | * | Upgrade protobuf library to v2.6.1.Jeff Davidson2015-01-20410-476/+897
| |/ /
* | | am 80aff29b: Merge "Update protobuf\'s gtest to expected version."Jeff Davidson2015-01-20128-8683/+39460
|\ \ \ | |/ /
| * | Merge "Update protobuf's gtest to expected version."Jeff Davidson2015-01-20128-8683/+39460
| |\ \
| | * | Update protobuf's gtest to expected version.Jeff Davidson2015-01-20128-8683/+39460
| |/ /
* | | am 77a6b2f4: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-15466-17934/+93818
|\ \ \ | |/ /
| * | Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-15466-17934/+93818
| |\ \
| | * | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-15466-17934/+93818
| |/ /
* | | am c7c25812: Merge "When no clear() is generated, still initialize fields."Brian Duff2015-01-094-12/+33
|\ \ \ | |/ /
| * | 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
* | | | am 25794277: Merge "Add clone() method support for nano."Brian Duff2015-01-0920-10/+213
|\ \ \ \ | |/ / /
| * | | 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
| |/ / /
* | | | am 3bd72e50: Merge "Fix comments."Brian Duff2015-01-081-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Fix comments."Brian Duff2015-01-081-2/+2
| |\ \ \ | | |/ / | |/| |