aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into ↵Wink Saville2014-08-210-0/+0
|\ | | | | | | | | | | fix-merge-conclict" * commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
| * am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"Wink Saville2014-08-210-0/+0
| |\ | | | | | | | | | | | | * commit 'd1439291d0a2d6558903205676d41410c319587e': Revert "Merge commit 'e887563a' into fix-merge-conclict"
* | \ am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am ↵Jan-Willem Maarse2014-08-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
| * | am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am ↵Jan-Willem Maarse2014-08-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
* | \ \ am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ↵Bill Yi2014-08-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
| * | | am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge ↵Bill Yi2014-08-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '0e54db6b8ac292b4193a924176a939d4326e803b':
* | \ \ \ am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for ↵Jeff Davidson2014-08-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | merge of 592b6078 to master * commit '3656cc20c8a569964d0450ce3207b651c007c35c':
| * | | | am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of ↵Jeff Davidson2014-08-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592b6078 to master * commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
* | \ \ \ \ am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am ↵Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
| * | | | | am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --ignore_service nano proto compiler flag" * commit '3af26f43dc55563842cee8604f1e802bf40a2585':
* | \ \ \ \ \ am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ↵Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
| * | | | | | am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
* | \ \ \ \ \ \ am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
| * | | | | | | am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
* | \ \ \ \ \ \ \ am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conflict * commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
| * | | | | | | | am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflictWink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
* | \ \ \ \ \ \ \ \ am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ↵Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
| * | | | | | | | | am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge ↵Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'de6420aa3fef9f6f85e88fd8e0c7667230d81753':
* | \ \ \ \ \ \ \ \ \ am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am ↵Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
| * | | | | | | | | | am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix ↵Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compile error on mac 10.9" * commit 'c8f69926325e0653ba4244dbd041c2d29b784194':
* | \ \ \ \ \ \ \ \ \ \ am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afc1553a: Merge "Extension overhaul." * commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
| * | | | | | | | | | | am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Extension overhaul." * commit '9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10':
* | \ \ \ \ \ \ \ \ \ \ \ am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
| * | | | | | | | | | | | am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes I9fecff3c,I2c1eb07f * commit '0eaea6a8d71e3b323f2fe3bccb3829162c04e33c':
* | \ \ \ \ \ \ \ \ \ \ \ \ am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of ↵Jie Dai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6965d891 to klp-modular-dev-plus-aosp * commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
| * | | | | | | | | | | | | am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to ↵Jie Dai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '0ce2c26133762a55c52c0262bbe393370b806276':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8af729b: Merge "Allow whitespace in nano codegen options." * commit '5843426abfdb490874f9d523dac04a825580c7af':
| * | | | | | | | | | | | | | am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Allow whitespace in nano codegen options." * commit '0c063c66604c5dee434534ff775eb6d18ce4ed7b':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'd043ff9d86baa219256036053f09dc5190f38f63':
| * | | | | | | | | | | | | | | am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Correctness: floating point equality using bits instead of ==." * commit '06396abfe648b84e4c17d0e4a98a6cd34d57aaab':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
| * | | | | | | | | | | | | | | | am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'e41d4c041cb2c6d58c4508cf792cd4e987991b2a':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am ↵Andrew Flynn2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '3628a851ca99c7b2058702aad9bb97f408513e56':
| * | | | | | | | | | | | | | | | | am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix ↵Andrew Flynn2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageNanoPrinter for accessors" * commit '11b030c32e2b740283ddd455e1e29748667cf314':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':
| * | | | | | | | | | | | | | | | | | am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Avoid class initializers to help ProGuard." * commit '843619f3a85440e94d1cbec0f71173eb560d6d73':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '01d1cdebf2de82c31ccd98909530213c489809a7':
| * | | | | | | | | | | | | | | | | | | am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Nano: don\'t generate accessor methods for nested methods" * commit '175d44dbf967c326956f5ee11cfe72cbd571601c':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am ↵The Android Open Source Project2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '23b66756ffe59505358b83f93ebe5880eb1be702':
| * | | | | | | | | | | | | | | | | | | | am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge ↵The Android Open Source Project2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am ↵The Android Open Source Project2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':
| * | | | | | | | | | | | | | | | | | | | | am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge ↵The Android Open Source Project2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '6a76a968d2c5c22a313dd2646d1b2941d17ff89d':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':
| * | | | | | | | | | | | | | | | | | | | | | am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Align with main: two ways of parsing repeated packable fields." * commit 'fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':
| * | | | | | | | | | | | | | | | | | | | | | | am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Update MessageNano#toString() to return mostly valid TextFormat." * commit '7630b4785d2675d37a272dc274318bd5a77c3805':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '8948d605872d310771d1e9e73669778660a6b787':
| * | | | | | | | | | | | | | | | | | | | | | | | am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warnings warnings in header files, hide others." * commit '4d28b813b64ccc215cd462de7f33455abbe04d0b':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'dce52afd8eb043950cbfac7e057362918159b07f':
| * | | | | | | | | | | | | | | | | | | | | | | | | am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Minimize method count for nanoproto." * commit 'fdf5bde4157bb3e5a5dc36d4acda930fd74933f1':
generated by cgit v1.1 at 2025-01-08 08:28:02 +0000