 Max Cai
|
34623821a6
am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
a476440cb4
am f39998c2: am daf63839: Merge "Keep pointers to extension values."
|
%!s(int64=11) %!d(string=hai) anos |
|
Ying Wang
|
6a4c81a12c
am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
|
%!s(int64=11) %!d(string=hai) anos |
|
Baligh Uddin
|
e083bdfa41
am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
39c59c2faa
am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
0554e65973
am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
|
%!s(int64=11) %!d(string=hai) anos |
|
Jan-Willem Maarse
|
2e8a9c78aa
am 67ebd315: 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
|
eb0cd10027
am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
|
%!s(int64=11) %!d(string=hai) anos |
|
Jeff Davidson
|
b04e9a7b37
am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
748d761e0b
am 3af26f43: 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
|
1778b679a8
am 90048528: 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
|
5e3937e672
am 16aad88f: 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
|
60166506e9
am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
|
%!s(int64=11) %!d(string=hai) anos |
|
Wink Saville
|
2952088303
am 89f0407f: am 232698c4: am de6420aa: 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
|
6cb2f95c5b
am b28d1738: am 0cb1a2f6: am c8f69926: 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
|
88c2ee3798
am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
4bc9f977f6
am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
|
%!s(int64=11) %!d(string=hai) anos |
|
Jie Dai
|
8c05028d7b
am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
d887adc782
am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
a8176e2190
am c1d044c0: am d043ff9d: am 06396abf: 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
|
34c6031778
am ddf77b19: am b22123d1: am e41d4c04: 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
|
f83fdc969d
am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
1a6e5f23ca
am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
8d8cd5dcb9
am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
|
%!s(int64=11) %!d(string=hai) anos |
|
The Android Open Source Project
|
97817997d6
am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
|
%!s(int64=11) %!d(string=hai) anos |
|
The Android Open Source Project
|
2719e4a606
am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
578b455261
am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
aa50da36c9
am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
2e93315ba0
am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
|
%!s(int64=11) %!d(string=hai) anos |
|
Max Cai
|
d997452883
am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
|
%!s(int64=11) %!d(string=hai) anos |
