AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
1,065 Commits 35 Branches 138 Tags 124 MiB
dd449e1c79
Commit Graph

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
fce0ffdf13 am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 
* commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':
 2014-08-21 17:56:42 +00:00
Wink Saville
9378b718d1 am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 
* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':
 2014-08-21 17:56:41 +00:00
Max Cai
dd49d0a1e9 am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 
* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
  Fix access around unknownFieldData.
 2014-08-21 17:39:00 +00:00
Max Cai
e57ee765da am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 
* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
  Keep pointers to extension values.
 2014-08-21 17:38:59 +00:00
Ying Wang
11985d9b4e am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 
* commit 'cca3823db855ecbcad350332a274f253be7e9662':
 2014-08-21 17:38:59 +00:00
Baligh Uddin
3d5bce541d am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 
* commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
 2014-08-21 17:38:58 +00:00
Wink Saville
58ed7e4ae9 am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 
* commit '1f8913765270e9d90ad7384156629e116236355d':
 2014-08-21 17:38:58 +00:00
Wink Saville
8836d129d1 am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 
* commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
 2014-08-21 17:38:57 +00:00
Jan-Willem Maarse
693df0c028 am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 
* commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
 2014-08-21 17:38:57 +00:00
Bill Yi
3b3f9c919a am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 
* commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
 2014-08-21 17:38:56 +00:00
Jeff Davidson
87e6efa134 am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 
* commit '3656cc20c8a569964d0450ce3207b651c007c35c':
 2014-08-21 17:38:56 +00:00
Max Cai
3b592294ac am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 
* commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
 2014-08-21 17:38:55 +00:00
Max Cai
2e66ca80c3 am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 
* commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
 2014-08-21 17:38:54 +00:00
Wink Saville
74848a35c0 am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 
* commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
 2014-08-21 17:38:54 +00:00
Wink Saville
cb06adc62f am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 
* commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
 2014-08-21 17:38:53 +00:00
Max Cai
34623821a6 am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 
* commit '55ef21bca9802af2a9aadd593cc606706b13f8da':
  Fix access around unknownFieldData.
 2014-08-21 17:30:43 +00:00
Max Cai
a476440cb4 am f39998c2: am daf63839: Merge "Keep pointers to extension values." 
* commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9':
  Keep pointers to extension values.
 2014-08-21 17:30:42 +00:00
Ying Wang
6a4c81a12c am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 
* commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
 2014-08-21 17:30:42 +00:00
Baligh Uddin
e083bdfa41 am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 
* commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
 2014-08-21 17:30:42 +00:00
Wink Saville
39c59c2faa am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 
* commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
 2014-08-21 17:30:41 +00:00
Wink Saville
0554e65973 am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 
* commit 'd1439291d0a2d6558903205676d41410c319587e':
  Revert "Merge commit 'e887563a' into fix-merge-conclict"
 2014-08-21 17:30:41 +00:00
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" 
* commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
 2014-08-21 17:30:40 +00:00
Bill Yi
eb0cd10027 am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 
* commit '0e54db6b8ac292b4193a924176a939d4326e803b':
 2014-08-21 17:30:40 +00:00
Jeff Davidson
b04e9a7b37 am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 
* commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
 2014-08-21 17:30:39 +00:00
Max Cai
748d761e0b am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 
* commit '3af26f43dc55563842cee8604f1e802bf40a2585':
 2014-08-21 17:30:39 +00:00
Max Cai
1778b679a8 am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 
* commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
 2014-08-21 17:30:38 +00:00
Wink Saville
5e3937e672 am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 
* commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
 2014-08-21 17:30:38 +00:00
Wink Saville
60166506e9 am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 
* commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
 2014-08-21 17:30:38 +00:00
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" 
* commit '89f0407f57f9127ab8d1040a06af741173faece2':
 2014-08-21 02:47:42 +00:00
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" 
* commit 'b28d17386a434ee49e48d958823141036ed8c127':
 2014-08-21 02:47:41 +00:00
Max Cai
88c2ee3798 am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul." 
* commit '339f5a6db8053b4095af6454250e246ffeb8b295':
 2014-08-21 02:47:40 +00:00
Max Cai
4bc9f977f6 am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 
* commit '34559f88be5c2071a9be321ed01725b364cdf29d':
 2014-08-21 02:47:40 +00:00
Jie Dai
8c05028d7b am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp 
* commit '6f45464eb45eba2846ee9e96aaecd81fef4662ef':
 2014-08-21 02:47:39 +00:00
Max Cai
d887adc782 am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options." 
* commit 'cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c':
 2014-08-21 02:47:39 +00:00
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 ==." 
* commit 'c1d044c0b1b97265e3bef096acdaa503d9ec615a':
 2014-08-21 02:47:38 +00:00
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." 
* commit 'ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4':
 2014-08-21 02:47:38 +00:00
Andrew Flynn
f83fdc969d am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" 
* commit 'a155ce7ea537b9388e0785d74363f3e11177a5e0':
 2014-08-21 02:47:37 +00:00
Max Cai
1a6e5f23ca am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." 
* commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':
 2014-08-21 02:47:37 +00:00
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" 
* commit '3a324516bd8757996725ac3c28224bc41d5123be':
 2014-08-21 02:47:36 +00:00
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 
* commit '8d5b7fb23a951dabb95bce445ef588b68e6b0e63':
 2014-08-21 02:47:35 +00:00
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 
* commit '6d879b4e0d411dd925978437c43e052cf3fba00e':
 2014-08-21 02:47:35 +00:00
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." 
* commit 'a59cc53b9271c09380769f86846583a94349f390':
 2014-08-21 02:47:34 +00:00
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." 
* commit '9b07838482cc1c03bf486ea9b5f465d329bb07df':
 2014-08-21 02:47:34 +00:00
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." 
* commit '2267616c6621b748c8551c9895e47a792ee04cb2':
 2014-08-21 02:47:33 +00:00
Max Cai
d997452883 am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." 
* commit '4b700b8a8b6ed8151aa22b99b2e0dac214e251f3':
 2014-08-21 02:47:33 +00:00
Max Cai
31e0909c49 am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." 
* commit '438ca4a840876afd43ac8cbea4df2130c0629072':
 2014-08-21 02:47:32 +00:00
Max Cai
09592e05e9 am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." 
* commit '17395e556af77b06ea3de454d5c279802ec8cc49':
 2014-08-21 02:47:32 +00:00
Max Cai
c032a15817 am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" 
* commit '826b4cf541f3d21f374e2749c48348c6539c6b2e':
 2014-08-21 02:47:31 +00:00
Max Cai
15167d6f58 am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." 
* commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':
 2014-08-21 02:47:31 +00:00
Max Cai
789d9b94e9 am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." 
* commit '03016e747254a97144db2703106787b493fb5014':
 2014-08-21 02:47:30 +00:00