aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stop using libstdc++.HEADreplicant-6.0-0001replicant-6.0Dan Albert2016-01-151-3/+3
| | | | | | | Statically link libc++ because we copy aprotoc to unbundled projects where libc++.so may not be available. Change-Id: I1f1abc015696c1ccd8600338c147d51aca2253a1
* Fixed Unused Parameter warning in headers.Austin Schuh2015-05-203-12/+13
| | | | | | | | | Cherry-pick of: https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053 Bug: 21303860 Signed-off-by: Jeff Davidson <jpd@google.com> Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
* Handle 0-length byte buffers in micro and nano protobufsAndre Eisenbach2015-05-042-0/+4
| | | | Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
* am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGEJuan Silveira2015-04-280-0/+0
|\ | | | | | | | | * commit '4a9673333abfffe0b3603d412e1f3bc134b443ac': DO NOT MERGE
| * am 2a22b4d8: DO NOT MERGEJuan Silveira2015-04-280-0/+0
| |\ | | | | | | | | | | | | * commit '2a22b4d85d0026e8ffc8768b4822bc36120fc6d4': DO NOT MERGE
| | * DO NOT MERGEJuan Silveira2015-04-282-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a hasExtension method to ExtendableMessageNano. It allows checking for the presence of an extension without having to deserialize the field. This a cherry-pick of 0f67b212cd169ccf83221273ed88504d7e3f8165 from master. Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
* | | am a07081b8: am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException ↵Brian Duff2015-04-212-1/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | instead of IllegalArgumentException." * commit 'a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e': Throw OutOfSpaceException instead of IllegalArgumentException.
| * | am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException instead of ↵Brian Duff2015-04-212-1/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | IllegalArgumentException." * commit '63b42c8d7eb6b60fed296273513fc88b34b93469': Throw OutOfSpaceException instead of IllegalArgumentException.
| | * \ am 92f1bf25: Merge "Throw OutOfSpaceException instead of ↵Brian Duff2015-04-212-1/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IllegalArgumentException." * commit '92f1bf25e822eb156a57b7ede390efb89e283a87': Throw OutOfSpaceException instead of IllegalArgumentException.
| | | * \ Merge "Throw OutOfSpaceException instead of IllegalArgumentException."Brian Duff2015-04-212-1/+28
| | | |\ \
| | | | * | Throw OutOfSpaceException instead of IllegalArgumentException.Charles Munger2015-04-212-1/+28
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a MessageNano containing a String is serialized into a buffer that is too small to contain it, and the buffer's boundary happens to be where the string field's length delimiting varint is serialized, and the string's length and 3*length have the same length when encoded as a varint, an IllegalArgumentException is thrown rather than an OutOfSpaceException. Github issue: https://github.com/google/protobuf/issues/292 Change-Id: If478d68cf15bfd0662252d008e42b2bf1ff1c75e
* | | | | Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-063-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out dex (apparently) was inlining these protected final methods from ExtendableMessageNano into every message class. Removing these methods from the base class and inlining their code reduces the method count by 2 methods / message when the store_unknown_fields option is on. Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
* | | | | am eff5d5b3: am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each ↵Jeff Davidson2015-04-064-36/+34
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Parcelable message." * commit 'eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482': Generate a CREATOR for each Parcelable message.
| * | | | am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable ↵Jeff Davidson2015-04-064-36/+34
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | message." * commit '1d4b8b9fc9950152a1b235dfc83cf613a3b18ca4': Generate a CREATOR for each Parcelable message.
| | * | | am ff882b40: Merge "Generate a CREATOR for each Parcelable message."Jeff Davidson2015-04-064-36/+34
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'ff882b4094995bc7dd9b183951cf84aa04527361': Generate a CREATOR for each Parcelable message.
| | | * | 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
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less ideal from a dex count perspective because it requires a new variable for each message, and because most apps have proguard rules that will ensure that CREATOR classes are retained. However, it is required to be able to use nano protos inside of AIDL files, as the autogenerated AIDL code fails to compile otherwise. This is a substantial benefit as it allows for backwards-compatible parameters and return types in AIDL methods along the lines of safeparcel. Bug: 19084705 Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
* | | | | am aba240b0: (-s ours) reset to 5cdb89e. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-250-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit 'aba240b005645cc557b21cff484928c3024b0fc3':
| * | | | reset to 5cdb89e. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-240-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 25f140b3: (-s ours) Reset back to c6d612a. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * commit '25f140b3e3d38af172ba484561a5da1667325629': Inline unknownFieldData{Equals,HashCode} to generated code. Expose generate_clear as an option.
| * | | | Reset back to c6d612a. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \
| | * \ \ \ reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | am a20fd654: am c4e7b92f: Merge "Make the tag field public."Brian Duff2015-03-201-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a20fd65468ba6975aa65f1fe565d3dfd23207621': Make the tag field public.
| | | * \ \ \ am 3f1b763a: am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."Brian Duff2015-03-202-0/+29
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088': Add MessageNano.messageNanoEquals().
| | | * \ \ \ \ am bb80065a: am 0068978c: Merge "Fixed octal printing of bytearrays"Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb80065a75206799123bde22fdd533dfe3392e52': Fixed octal printing of bytearrays
| | | * \ \ \ \ \ am d85ee8b8: am 77866143: Merge "Revert "Fixed octal printing of bytearrays""Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd85ee8b8cda8cba35a28952f0de9186abc3422c5': Revert "Fixed octal printing of bytearrays"
| | | * \ \ \ \ \ \ am a78c7868: am 238e0ac5: Merge "Fixed octal printing of bytearrays"Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a78c78688b1e79afc7cb67316ff7d104829d84fd': Fixed octal printing of bytearrays
| | | * \ \ \ \ \ \ \ am bfe5b30e: am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access around unknownFieldData." * commit 'bfe5b30ef488bbbfb3a52775d796d3b9e08e12c5':
| | | * \ \ \ \ \ \ \ \ am 1b3c7f48: am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointers to extension values." * commit '1b3c7f48c93900ac850269004cfc96489f487861':
| | | * \ \ \ \ \ \ \ \ \ am cb095d21: am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am ↵Ying Wang2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eed3705: You CANNOT change the global WITH_DEXPREOPT * commit 'cb095d21de77c2f261dddf6402764f7868082615':
| | | * \ \ \ \ \ \ \ \ \ \ am ca524e2f: am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am ↵Baligh Uddin2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'ca524e2f9e94099d2399d6487a4d9b6fe02509ed':
| | | * \ \ \ \ \ \ \ \ \ \ \ am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '62a0f9d481ce6c5525dd93007afbdf092e011237':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'e887563a\' into fix-merge-conclict" * commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4344e415: am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am ↵Jan-Willem Maarse2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '4344e415b9ed3da78da50853e288aaec5cc515cb':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 549268de: am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am ↵Bill Yi2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '549268de5c242ab7948b53bc5f8e8a83d33b72fe':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d2d0f40: am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am ↵Jeff Davidson2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8113c186: resolved conflicts for merge of 592b6078 to master * commit '6d2d0f4023043221456fd263e33648b1ab6bc502':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 563f32c4: am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit '563f32c433628a38440b1d799f52c1d4f889aaf3':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0d0b3264: am 2b469993: am 61317c32: am 90048528: am 888cafe4: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '985244abea85772c5fa4cae5012af903ca59a30a':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70f9fdd3: am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'f65ee555\' into fix-merge-conflict * commit '70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75244665: am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '75244665e3b7d228b0887d0ff43a84a30c358f62':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8345e3e6: am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am ↵Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." * commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc9b38a1: am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit 'fc9b38a1992610a6a0e3b51dad39901df293a980':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4cce7ca7: am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved ↵Jie Dai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit '4cce7ca7d4cf026a62a1fd5b37b7e028040866da':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc08aae5: am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." * commit 'dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am ↵Andrew Flynn2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '18072b1d0063576040575f8970d36f11a8527fbc':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am ↵Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '31111e302e14330c3868e6b1456dbe1e0293edef':
generated by cgit v1.1 at 2024-04-16 08:51:20 +0000