summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Throw OutOfSpaceException instead of IllegalArgumentException."gradle_1.2.3gradle_1.2.2Brian Duff2015-04-212-1/+28
|\
| * Throw OutOfSpaceException instead of IllegalArgumentException.Charles Munger2015-04-212-1/+28
|/
* Merge "Generate a CREATOR for each Parcelable message."gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0android-wear-5.1.1_r1android-wear-5.1.0_r1Jeff Davidson2015-04-064-36/+34
|\
| * Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-034-36/+34
|/
* Merge "Inline unknownFieldData{Equals,HashCode} to generated code."gradle_1.2.0-beta1Brian Duff2015-03-203-35/+19
|\
| * Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-03-203-35/+19
|/
* 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
* | 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
|/ /
* | Merge commit '7304898f86cd6b2e525772e9cda4ba686b7d3fd2' into HEADBill Yi2015-02-191-0/+13
|\ \ | |/ |/|
| * 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
| |\ \
| * \ \ am f2982dd2: Merge "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
| |\ \ \ \
| * \ \ \ \ am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."Jeff Davidson2015-01-22410-476/+897
| |\ \ \ \ \
| * \ \ \ \ \ am 80aff29b: Merge "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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am c7c25812: Merge "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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 3bd72e50: Merge "Fix comments."Brian Duff2015-01-081-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am c35945d0: Merge "Optimize measurement and serialization of nano protos."Brian Duff2015-01-072-28/+250
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 41be9083: Merge "Fix bug with large extension field numbers."Brian Duff2015-01-063-9/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 4353bbc8: Merge "Add platform versions of the protobuf libraries."Dan Albert2014-11-111-0/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 123e5376: am dbb9c303: Merge "Added an API method in FieldData to allow ac...Behrooz Khorashadi2014-11-061-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a12fbb0a: am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-2927-10/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78c25630: am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_...Brian Duff2014-10-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c6547047: am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 278f6dcc: am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s h...Brian Duff2014-10-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-033-12/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in ha...Brian Duff2014-09-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Include libc++ statically in aprotoc."Jeff Davidson2015-02-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Include libc++ statically in aprotoc.Jeff Davidson2015-02-061-0/+4
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Exclude cachedSize when printing fields."gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0Brian Duff2015-01-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Exclude cachedSize when printing fields.Brian Duff2015-01-221-0/+4
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-15466-17934/+93818
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
generated by cgit v1.1 at 2024-12-22 10:12:02 +0000