502 Commits (1a6e5f23cae79043900a6b470ea6ba57d0aca559)
 

Author SHA1 Message Date
Brian Duff c390fe3eb3 am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName." 11 years ago
Brian Duff 23c5978a76 Merge "Don't return NULL from {Boxed}PrimitiveTypeName." 11 years ago
Brian Duff 7acc0f831f Don't return NULL from {Boxed}PrimitiveTypeName. 11 years ago
Max Cai a481ed8269 am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
Max Cai 2a5f3f97a0 Merge "Add a hasExtension method to ExtendableMessageNano." 11 years ago
Juan Silveira c052b50388 Add a hasExtension method to ExtendableMessageNano. 11 years ago
Max Cai 2e91cf4f68 am a88808d4: Merge "Fix access around unknownFieldData." 11 years ago
Max Cai 9c2d63c8d3 am daf63839: Merge "Keep pointers to extension values." 11 years ago
Max Cai 30b1454d8b Merge "Keep pointers to extension values." 11 years ago
Max Cai 7a83d3482a Merge "Fix access around unknownFieldData." 11 years ago
Max Cai d1a8a8f6f1 Fix access around unknownFieldData. 11 years ago
Juan Silveira 79f19eb9f1 Keep pointers to extension values. 11 years ago
Max Cai 9ceb3d4acc Fix how getRepeatedFieldArrayLength works 11 years ago
Ying Wang 30cd2a4a98 am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin c7213e1c39 am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Ying Wang b18d5c1d43 am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin f5759da88c am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Ying Wang 82461de508 You CANNOT change the global WITH_DEXPREOPT 11 years ago
Baligh Uddin 709cb7348e keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 11 years ago
Qiwen Zhao 1d50c6b47c reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 11 years ago
Wink Saville 9db6d437df am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville 3b0952fb80 Revert "Merge commit 'e887563a' into fix-merge-conclict" 11 years ago
Wink Saville d9b892d45b Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 11 years ago
Wink Saville fadc11055e Revert "Merge commit 'e887563a' into fix-merge-conclict" 11 years ago
Jan-Willem Maarse 9a58c6f56c am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi ef5fd0e053 am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson be8aadfd3b am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai 8b6445a019 am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 8624f47bab am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b67c3fa484 am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago
Wink Saville 642f7003a7 Merge commit 'f65ee555' into fix-merge-conflict 11 years ago
Jan-Willem Maarse 9ad944e2d6 am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 11 years ago
Bill Yi e76c2cefee am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 11 years ago
Jeff Davidson a3d1a03fc1 am 8113c186: resolved conflicts for merge of 592b6078 to master 11 years ago
Max Cai ba0ea9552f am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 11 years ago
Max Cai 78e5e83012 am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville b05e2ffe0c am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 11 years ago
Wink Saville 2666d4df51 Merge commit 'e887563a' into fix-merge-conclict 11 years ago
Wink Saville f812e7f2ca am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville bf2bb67903 am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" 11 years ago
Max Cai 42c481a7f5 am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." 11 years ago
Max Cai 83ed21fcb0 am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 11 years ago
Jie Dai 1e6f98066a am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp 11 years ago
Wink Saville 63bb1894f7 am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 11 years ago
Wink Saville e4f1a3457f am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9" 11 years ago
Max Cai 915cddaa8a am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." 11 years ago
Max Cai 4def4b4501 am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 11 years ago
Jie Dai 9f4dda6d11 resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp 11 years ago
Max Cai 89197d0fdc am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." 11 years ago
Max Cai 1f0c9cdba5 am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." 11 years ago