Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge commit 'e887563a' into fix-merge-conclict | Wink Saville | 2014-05-07 | 5 | -51/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cache... | Wink Saville | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in... | Wink Saville | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error ... | Wink Saville | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" | Wink Saville | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus... | Jie Dai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp | Jie Dai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace i... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codege... | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: float... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equ... | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize r... | Max Cai | 2014-05-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required field... | Max Cai | 2014-05-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |