Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9:... | Wink Saville | 2014-08-21 | 0 | -0/+0 |
|\ | |||||
| * | am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix o... | Wink Saville | 2014-08-20 | 0 | -0/+0 |
| |\ | |||||
| | * | am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classnam... | Wink Saville | 2014-08-20 | 0 | -0/+0 |
| | |\ | |||||
* | | \ | am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0:... | Ying Wang | 2014-08-21 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You C... | Ying Wang | 2014-08-20 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change ... | Ying Wang | 2014-08-20 | 0 | -0/+0 |
| | |\ \ | |||||
* | | \ \ | am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works" | Max Cai | 2014-08-07 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge "Fix how getRepeatedFieldArrayLength works" | Max Cai | 2014-08-05 | 1 | -5/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix how getRepeatedFieldArrayLength works | Max Cai | 2014-07-03 | 1 | -5/+1 |
* | | | | | | | am f91b7fa1: Fix build, by using external/zlib instead of system zlib | Sam Hasinoff | 2014-08-05 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fix build, by using external/zlib instead of system zlib | Sam Hasinoff | 2014-08-05 | 1 | -0/+1 |
* | | | | | | | am 4d11e705: Merge "Fix the aprotoc target for Windows." | Leandro Gracia Gil | 2014-07-31 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Fix the aprotoc target for Windows." | Leandro Gracia Gil | 2014-07-29 | 2 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix the aprotoc target for Windows. | Leandro Gracia Gil | 2014-07-28 | 2 | -1/+5 |
| |/ / / / / / | |||||
* | | | | | | | am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName." | Brian Duff | 2014-07-22 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Don't return NULL from {Boxed}PrimitiveTypeName." | Brian Duff | 2014-07-21 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Don't return NULL from {Boxed}PrimitiveTypeName. | Brian Duff | 2014-07-21 | 1 | -4/+4 |
| |/ / / / / / | |||||
* | | | | | | | am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano." | Max Cai | 2014-07-18 | 2 | -2/+69 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Add a hasExtension method to ExtendableMessageNano." | Max Cai | 2014-07-17 | 2 | -2/+69 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add a hasExtension method to ExtendableMessageNano. | Juan Silveira | 2014-07-17 | 2 | -2/+69 |
| |/ / / / / / | |||||
* | | | | | | | am a88808d4: Merge "Fix access around unknownFieldData." | Max Cai | 2014-07-15 | 7 | -16/+36 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix access around unknownFieldData." | Max Cai | 2014-07-14 | 7 | -16/+36 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix access around unknownFieldData. | Max Cai | 2014-07-15 | 7 | -16/+36 |
| |/ / / / / / | |||||
* | | | | | | | am daf63839: Merge "Keep pointers to extension values." | Max Cai | 2014-07-15 | 8 | -256/+920 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge "Keep pointers to extension values." | Max Cai | 2014-07-14 | 8 | -256/+920 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Keep pointers to extension values. | Juan Silveira | 2014-07-14 | 8 | -256/+920 |
| |/ / / / | |||||
* | | | | | am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT | Ying Wang | 2014-05-21 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 8eed3705: You CANNOT change the global WITH_DEXPREOPT | Ying Wang | 2014-05-21 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | You CANNOT change the global WITH_DEXPREOPT | Ying Wang | 2014-05-21 | 1 | -1/+1 |
* | | | | | | am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73... | Baligh Uddin | 2014-05-21 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c2... | Baligh Uddin | 2014-05-21 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce | Baligh Uddin | 2014-05-21 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 | Qiwen Zhao | 2014-05-13 | 0 | -0/+0 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||||
* | | | | | | | am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict... | Wink Saville | 2014-05-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-mod... | Wink Saville | 2014-05-07 | 5 | -9/+51 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "Merge commit 'e887563a' into fix-merge-conclict" | Wink Saville | 2014-05-07 | 5 | -9/+51 |
* | | | | | | | | Revert "Merge commit 'e887563a' into fix-merge-conclict" | Wink Saville | 2014-05-07 | 2 | -4/+39 |
* | | | | | | | | am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix N... | Jan-Willem Maarse | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clear... | Jan-Willem Maarse | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bda... | Bill Yi | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a... | Bill Yi | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master | Jeff Davidson | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 8113c186: resolved conflicts for merge of 592b6078 to master | Jeff Davidson | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_serv... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano prot... | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cache... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in... | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t res... | Wink Saville | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize... | Wink Saville | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge commit 'f65ee555' into fix-merge-conflict | Wink Saville | 2014-05-07 | 2 | -39/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |