Wink Saville
|
642f7003a7
|
Merge commit 'f65ee555' into fix-merge-conflict
* commit 'f65ee555':
Change-Id: Ic1216c50b608f1609fd8a1a1a50209c4486f30a4
|
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"
* commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':
|
11 years ago |
Bill Yi
|
e76c2cefee
|
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
* commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':
|
11 years ago |
Jeff Davidson
|
a3d1a03fc1
|
am 8113c186: resolved conflicts for merge of 592b6078 to master
* commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':
|
11 years ago |
Max Cai
|
ba0ea9552f
|
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
* commit '99c9801813fdc2eccd5db391c00d0250c327e344':
|
11 years ago |
Max Cai
|
78e5e83012
|
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':
|
11 years ago |
Wink Saville
|
b05e2ffe0c
|
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
* commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':
|
11 years ago |
Wink Saville
|
2666d4df51
|
Merge commit 'e887563a' into fix-merge-conclict
* commit 'e887563a':
Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""
Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c
|
11 years ago |
Wink Saville
|
f812e7f2ca
|
am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit 'd89b3060b40d8485d02e48d11056750495ecb577':
|
11 years ago |
Wink Saville
|
bf2bb67903
|
am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
* commit '27243737cc739c25c8905cbe9b3040f500af127d':
|
11 years ago |
Max Cai
|
42c481a7f5
|
am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
* commit 'e8f7a71c113c692102115cf56071e7c24cf09c88':
|
11 years ago |
Max Cai
|
83ed21fcb0
|
am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
* commit '286f57055b99aa2c3c107f4cd8f49eeace8db5b5':
|
11 years ago |
Jie Dai
|
1e6f98066a
|
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
* commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':
|
11 years ago |
Wink Saville
|
63bb1894f7
|
am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit 'f213b0c6a86503ad752139f04f343578df45db07':
|
11 years ago |
Wink Saville
|
e4f1a3457f
|
am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
* commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':
|
11 years ago |
Max Cai
|
915cddaa8a
|
am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
* commit '9141054bc24597968ddb94fb466c07cd2a933706':
|
11 years ago |
Max Cai
|
4def4b4501
|
am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
* commit '5c3544dd69160dc00a7786977da220265a7c43c4':
|
11 years ago |
Jie Dai
|
9f4dda6d11
|
resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38
|
11 years ago |
Max Cai
|
89197d0fdc
|
am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
* commit 'fa7bf363b9b46a933c3c3c81ff7f75684760fba8':
|
11 years ago |
Max Cai
|
1f0c9cdba5
|
am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
* commit '2c210bb92ce2001e943b107710ba098295a55761':
|
11 years ago |
Max Cai
|
6a64e5f6d6
|
am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
* commit '0ea6895484185194b405af7bacfd1c6a0590d17c':
|
11 years ago |
Andrew Flynn
|
ec730f99d2
|
am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
* commit 'db4556edf20010913f977322d1544bec77c9c181':
|
11 years ago |
Max Cai
|
3966be95cb
|
am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit '649efad8ca2fd4a4770fddca4537b8a3d27be47c':
|
11 years ago |
Max Cai
|
4d5b68587a
|
am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
* commit 'aa721735628bd0affc98f3204729b39cceeb60d8':
|
11 years ago |
The Android Open Source Project
|
65403dd030
|
am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
* commit '2f8797132c9bca0235d4e937768625f432647d00':
|
11 years ago |
The Android Open Source Project
|
f87af7538f
|
am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
* commit 'dee682fd34a78eb0335df215b72a7c5de6520170':
|
11 years ago |
Max Cai
|
16890a2e3e
|
am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
* commit '5645677fddfd957ca8460f81b634a7108e50bd36':
|
11 years ago |
Max Cai
|
07777ed7b1
|
am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
* commit 'f2d09988508c1aa6a2da63944036d21126ca82f8':
|
11 years ago |
Max Cai
|
44fb048cbd
|
am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '5e0c3d21a0bd7065044b0b01b828940f5e1cb2a9':
|
11 years ago |
Max Cai
|
f0b0553b43
|
am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit '4ba333e8f251f9c8b27892452101ac31ffa38cae':
|
11 years ago |
Max Cai
|
c1ebdc53be
|
am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit 'd734d52f6ae689cd6efb768383056b5fb7ef3320':
|
11 years ago |
Max Cai
|
ca3ee371df
|
am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit 'fc9db907250a8d8f3e60ba57d8073a6ca8169d36':
|
11 years ago |
Max Cai
|
a4d6044d4d
|
am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit '92d0bd2567355384de6c1b0f2662f6d0c0a94707':
|
11 years ago |
Max Cai
|
407a507750
|
am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '6988e26be6d502789e7c1bed36e72873546d223a':
|
11 years ago |
Max Cai
|
5377fe8d63
|
am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
* commit 'f97b9cedc0160a0c13ba18467b8b3b38746b64bb':
|
11 years ago |
Max Cai
|
a6d2dea6cb
|
am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'e4bf716d77655a9434de44442663682f2ba5fbc1':
|
11 years ago |
Max Cai
|
92ee2f0ea8
|
am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit 'caf351056c6ce99dd4000003d84774ad953877fe':
|
11 years ago |
Max Cai
|
4091687400
|
am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'f593c0a51e5c901f9aa9d18857765f464808afee':
|
11 years ago |
Ulas Kirazci
|
dbe4eda3b7
|
am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
* commit '4dfa34e224c3d961c0d84e3a3b848f01e55d746c':
|
11 years ago |
Ulas Kirazci
|
7a29ad789e
|
am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit '90e065ddd7c3a620ee4f6160bf1227fdfe57a63f':
|
11 years ago |
Wink Saville
|
9d4ef46006
|
am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':
|
11 years ago |
Ulas Kirazci
|
e7eb156549
|
am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':
|
11 years ago |
Ulas Kirazci
|
dee998a2ea
|
am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':
|
11 years ago |
Ulas Kirazci
|
4202251da0
|
am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'a5df326138cdaf4874026c09e2967d8142eca811':
|
11 years ago |
Ulas Kirazci
|
0d7bc44bdf
|
am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit '194529f1952e4d873c8262e09a40ac71872859d2':
|
11 years ago |
Ulas Kirazci
|
991282903e
|
am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit '8c131d5bf75499455ce287aeb0af30030282a000':
|
11 years ago |
Adam Metcalf
|
3d365c953a
|
am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit '4104f751dbabfc2dd04adee381aa4d949f81dbe1':
|
11 years ago |
Wink Saville
|
1a4e9aadeb
|
am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit '662d2f44e91af91a37a59f1fe1697a00b6b724c9':
|
11 years ago |
Wink Saville
|
e478ddd511
|
am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':
|
11 years ago |
Wink Saville
|
648917d924
|
am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '7022c115663ac6e24afdc896fc6f155f1a9bc52c':
|
11 years ago |