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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
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':
|
10 years ago |
Max Cai
|
dfa03c1f20
|
am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
* commit 'fa0eb541ce7abf79b1bf7ba5526d3418d74657ab':
|
10 years ago |
Max Cai
|
b4948d7e03
|
am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
* commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':
|
10 years ago |
Max Cai
|
106ab9f855
|
am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
* commit 'a61b2ef1d7b372b858b6aae07cf3eebbf62184b8':
|
10 years ago |
Ulas Kirazci
|
6173389c74
|
am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
* commit '056670c92d2a1420accbb07e636b895d925df2a1':
|
10 years ago |
Ulas Kirazci
|
6172b92ec9
|
am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
* commit '73789372578a45ceae125e2f66254988ac7eed73':
|
10 years ago |
Wink Saville
|
72d1e4c1de
|
am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
* commit '8973d9e63f9f972d646b07719d9292752e3aa382':
|
10 years ago |
Ulas Kirazci
|
7d207bb141
|
am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
* commit 'd8fbc18826e4945c45b22b5d36d5e07deb08bf0a':
|
10 years ago |
Ulas Kirazci
|
4adac19858
|
am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
* commit '8877603f0c61a959ef667df563429589f3a71cc0':
|
10 years ago |
Ulas Kirazci
|
e984f5ac1b
|
am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
* commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':
|
10 years ago |
Ulas Kirazci
|
e1368404c2
|
am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
* commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':
|
10 years ago |
Ulas Kirazci
|
c76c4672f6
|
am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
* commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':
|
10 years ago |
Adam Metcalf
|
4d0809c712
|
am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':
|
10 years ago |
Wink Saville
|
628e245da3
|
am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
|
10 years ago |
Wink Saville
|
64b1c7780b
|
am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':
|
10 years ago |
Wink Saville
|
bf6b7cb8f7
|
am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':
|
10 years ago |
Wink Saville
|
07c34fa29b
|
am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':
|
10 years ago |
Wink Saville
|
052abeef0c
|
am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
* commit 'a94fe6cb54165b8139b719f287cdad4973f93643':
|
10 years ago |
Ying Wang
|
0f91148556
|
am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'b09fd32de981b889f973de772a696cef47162ebf':
|
10 years ago |
jieluo@google.com
|
786379af47
|
patch Issue 130740043 to trunk for other atomicops patches: [MIPS64] Add support for MIPS64 in protobuf
|
10 years ago |
Wink Saville
|
5cf6a25ac8
|
am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
|
10 years ago |
Wink Saville
|
681a96ff0e
|
am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
* commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
|
10 years ago |
Max Cai
|
fe0c21e262
|
am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
* commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
|
10 years ago |
Max Cai
|
a51cbaf3bf
|
am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
* commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
|
10 years ago |
Jie Dai
|
ea45d54168
|
am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
* commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
|
10 years ago |
Max Cai
|
38113673ef
|
am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
* commit '5843426abfdb490874f9d523dac04a825580c7af':
|
10 years ago |
Max Cai
|
e4ee5cac57
|
am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
* commit 'd043ff9d86baa219256036053f09dc5190f38f63':
|
10 years ago |
Max Cai
|
97c00d316c
|
am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
* commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
|
10 years ago |
Andrew Flynn
|
29513c5f98
|
am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
* commit '3628a851ca99c7b2058702aad9bb97f408513e56':
|
10 years ago |
Max Cai
|
44feae0a18
|
am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':
|
10 years ago |
Max Cai
|
5ae7d25119
|
am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
* commit '01d1cdebf2de82c31ccd98909530213c489809a7':
|
10 years ago |
The Android Open Source Project
|
73de4c551c
|
am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
* commit '23b66756ffe59505358b83f93ebe5880eb1be702':
|
10 years ago |
The Android Open Source Project
|
30b7da3aa1
|
am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
* commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':
|
10 years ago |
Max Cai
|
b1ba6ff653
|
am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
* commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':
|
10 years ago |
Max Cai
|
c5e93674e9
|
am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
* commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':
|
10 years ago |
Max Cai
|
e0f145b623
|
am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
* commit '8948d605872d310771d1e9e73669778660a6b787':
|
10 years ago |
Max Cai
|
caf14f7076
|
am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
* commit 'dce52afd8eb043950cbfac7e057362918159b07f':
|
10 years ago |
Max Cai
|
22ba1f6ef2
|
am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
* commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':
|
10 years ago |
Max Cai
|
3e2d499eba
|
am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
* commit 'e668f0c3a996574010b60daa74823bfa9429dcda':
|
10 years ago |
Max Cai
|
d86fe313e1
|
am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
* commit '74b536a558743acacb10e00aced05e59249a76bc':
|
10 years ago |
Max Cai
|
894827d9eb
|
am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
* commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':
|
10 years ago |