 Wink Saville
|
fadc11055e
Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
%!s(int64=11) %!d(string=hai) anos |
|
Jan-Willem Maarse
|
9a58c6f56c
am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
%!s(int64=11) %!d(string=hai) anos |
|
Bill Yi
|
ef5fd0e053
am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
%!s(int64=11) %!d(string=hai) anos |
|
Jeff Davidson
|
be8aadfd3b
am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
8b6445a019
am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
8624f47bab
am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
b67c3fa484
am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
642f7003a7
Merge commit 'f65ee555' into fix-merge-conflict
|
%!s(int64=11) %!d(string=hai) anos |
|
Jan-Willem Maarse
|
9ad944e2d6
am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
|
%!s(int64=11) %!d(string=hai) anos |
|
Bill Yi
|
e76c2cefee
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
%!s(int64=11) %!d(string=hai) anos |
|
Jeff Davidson
|
a3d1a03fc1
am 8113c186: resolved conflicts for merge of 592b6078 to master
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
ba0ea9552f
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
78e5e83012
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
b05e2ffe0c
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
2666d4df51
Merge commit 'e887563a' into fix-merge-conclict
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
f812e7f2ca
am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
bf2bb67903
am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
42c481a7f5
am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
83ed21fcb0
am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
|
%!s(int64=11) %!d(string=hai) anos |
|
Jie Dai
|
1e6f98066a
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
63bb1894f7
am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
e4f1a3457f
am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
915cddaa8a
am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
4def4b4501
am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
|
%!s(int64=11) %!d(string=hai) anos |
|
Jie Dai
|
9f4dda6d11
resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
89197d0fdc
am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
1f0c9cdba5
am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
6a64e5f6d6
am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
|
%!s(int64=11) %!d(string=hai) anos |
|
Andrew Flynn
|
ec730f99d2
am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
3966be95cb
am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
|
%!s(int64=11) %!d(string=hai) anos |
