Ulas Kirazci
|
9bb773f8c4
|
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':
|
10 years ago |
Adam Metcalf
|
87f4899a90
|
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
|
10 years ago |
Wink Saville
|
50b34232c9
|
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
|
10 years ago |
|
Wink Saville
|
6e81fbbc16
|
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
|
10 years ago |
|
Wink Saville
|
feac014e7d
|
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
|
10 years ago |
|
Wink Saville
|
b5c235ccc2
|
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
|
10 years ago |
|
Wink Saville
|
e8e5707aee
|
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
|
10 years ago |
Ying Wang
|
c89112387e
|
am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
|
10 years ago |
|
Ying Wang
|
b18d5c1d43
|
am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
* commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
You CANNOT change the global WITH_DEXPREOPT
|
11 years ago |
Baligh Uddin
|
f5759da88c
|
am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
|
11 years ago |
|
Ying Wang
|
82461de508
|
You CANNOT change the global WITH_DEXPREOPT
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
|
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
|
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"
This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.
Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
|
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
|
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 |
|
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 |
|
Wink Saville
|
94d87e4398
|
am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'efa53b19f45400ca98c1bb2dc1f5bfa87be033df':
|
11 years ago |
|
Wink Saville
|
583ccca8d5
|
am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '211bb9125a78b3b8772afc196e16640a8b7f2f7b':
|
11 years ago |
|
Max Cai
|
e323701ace
|
am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
* commit '6a1f70ab855a3c222783596c92574267e3cfa6e8':
|
11 years ago |
|
Max Cai
|
78544a3dbf
|
am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
* commit '6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe':
|
11 years ago |
|
Max Cai
|
6ceb306cca
|
am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
* commit 'a5273888480392ff8a8b0ea3af6617e18dbb1ed2':
|
11 years ago |
Andrew Flynn
|
8961fc07bd
|
am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
* commit '81d0f437ba2bb34cd59a019c2f15f862a9c5d45b':
|
11 years ago |
|
Max Cai
|
5e2d55d337
|
am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit '55c3d6d9fa8287676c6502ad20199bd932730681':
|
11 years ago |
|
Max Cai
|
96d4c1cb83
|
am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
* commit '7c0eadd45cb4e0fef8afffe1626c2e4711418b49':
|
11 years ago |
The Android Open Source Project
|
69576a3408
|
am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
* commit 'da929e3ea6310e7dc46745f191200afc489600e6':
|
11 years ago |
|
The Android Open Source Project
|
689ea73912
|
am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
* commit '6597e4f210be48b731e995c6c9950046ccf7689b':
|
11 years ago |
|
Max Cai
|
eb3871bcbd
|
am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
* commit 'b3ad7eaeb3233d9842a74e2252efa189d4c0524a':
|
11 years ago |
|
Max Cai
|
8e768270e9
|
am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
* commit '4115d56f3d03ca788a08a0a1eb6c79fa107550d3':
|
11 years ago |
|
Max Cai
|
1161744125
|
am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '139bd6ac80ca61f85796bded692eeb5bb932cfca':
|
11 years ago |
|
Max Cai
|
16d339f428
|
am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit 'b88c1729d89e76b06ae3b87d90cae6ea36cfde90':
|
11 years ago |
|
Max Cai
|
aff0edcc22
|
am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit '8eda9d3f991c62237a24e4d9f8e7f58df1687a86':
|
11 years ago |
|
Max Cai
|
493ac5bb15
|
am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit 'e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe':
|
11 years ago |
|
Max Cai
|
bd636aed71
|
am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit '0610e6834fa213c026d91fab037a649613840f44':
|
11 years ago |
|
Max Cai
|
11e2bf3bc2
|
am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '4b359335e94c44fa16b78c1406f3cd71b7fbf40b':
|
11 years ago |
