aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stop using libstdc++.HEADreplicant-6.0-0001replicant-6.0Dan Albert2016-01-151-3/+3
* Fixed Unused Parameter warning in headers.Austin Schuh2015-05-203-12/+13
* Handle 0-length byte buffers in micro and nano protobufsAndre Eisenbach2015-05-042-0/+4
* am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGEJuan Silveira2015-04-280-0/+0
|\
| * am 2a22b4d8: DO NOT MERGEJuan Silveira2015-04-280-0/+0
| |\
| | * DO NOT MERGEJuan Silveira2015-04-282-2/+69
* | | am a07081b8: am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException inste...Brian Duff2015-04-212-1/+28
|\ \ \ | |/ /
| * | am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException instead of Illegal...Brian Duff2015-04-212-1/+28
| |\ \
| | * \ am 92f1bf25: Merge "Throw OutOfSpaceException instead of IllegalArgumentExcep...Brian Duff2015-04-212-1/+28
| | |\ \
| | | * \ Merge "Throw OutOfSpaceException instead of IllegalArgumentException."Brian Duff2015-04-212-1/+28
| | | |\ \
| | | | * | Throw OutOfSpaceException instead of IllegalArgumentException.Charles Munger2015-04-212-1/+28
| | | |/ /
* | | | | Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-063-35/+19
* | | | | am eff5d5b3: am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Par...Jeff Davidson2015-04-064-36/+34
|\ \ \ \ \ | |/ / / /
| * | | | am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable messa...Jeff Davidson2015-04-064-36/+34
| |\ \ \ \ | | |/ / /
| | * | | 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 aba240b0: (-s ours) reset to 5cdb89e. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| | | |\ \ \
| | | * \ \ \ am 3f1b763a: am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."Brian Duff2015-03-202-0/+29
| | | |\ \ \ \
| | | * \ \ \ \ am bb80065a: am 0068978c: Merge "Fixed octal printing of bytearrays"Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am d85ee8b8: am 77866143: Merge "Revert "Fixed octal printing of bytearrays""Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am a78c7868: am 238e0ac5: Merge "Fixed octal printing of bytearrays"Max Cai2015-03-201-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am bfe5b30e: am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix a...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 1b3c7f48: am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep ...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am cb095d21: am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705:...Ying Wang2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am ca524e2f: am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a:...Baligh Uddin2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Rever...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e8...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4344e415: am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb:...Jan-Willem Maarse2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 549268de: am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae:...Bill Yi2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d2d0f40: am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186:...Jeff Davidson2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 563f32c4: am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0d0b3264: am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb:...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70f9fdd3: am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75244665: am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6:...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8345e3e6: am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52:...Wink Saville2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc9b38a1: am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4cce7ca7: am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved con...Jie Dai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc08aae5: am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437:...Andrew Flynn2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9:...Max Cai2015-03-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \