Max Cai
|
42da25e969
|
Revert "Fixed octal printing of bytearrays"
This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806.
Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a
|
10 years ago |
|
Max Cai
|
04f70ef5c7
|
Merge "Fixed octal printing of bytearrays"
|
10 years ago |
Linus Tufvesson
|
32a45d0921
|
Fixed octal printing of bytearrays
Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94
|
10 years ago |
David Hirschfeld
|
ef6eff20bd
|
Explicitly specify pyext/cpp_message.py in py_modules list
|
10 years ago |
|
David Hirschfeld
|
b7ec1a95d2
|
Added const qualifier to iterator to enable compiling with VS2008
|
10 years ago |
Feng Xiao
|
e9c00d9dd0
|
Rename COPYING.txt to LICENSE for opensource compliance and update links
in README.txt.
|
10 years ago |
jieluo@google.com
|
a21bf2e646
|
merge 2.6.0 to trunk
|
10 years ago |
|
jieluo@google.com
|
1eba9d9c74
|
merge tags/2.6.0 into trunk
|
10 years ago |
|
Max Cai
|
274705a916
|
am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
* commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':
|
10 years ago |
|
Max Cai
|
1dad0f2307
|
am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
* commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':
|
10 years ago |
Ying Wang
|
08dd6049ee
|
am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
* commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':
|
10 years ago |
Baligh Uddin
|
c64af59b6f
|
am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
* commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':
|
10 years ago |
Wink Saville
|
944f597185
|
am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':
|
10 years ago |
|
Wink Saville
|
df60b2505d
|
am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
* commit '8add9962a5c88ff307d573be91bb091a2b14568d':
|
10 years ago |
Jan-Willem Maarse
|
c430d41033
|
am 1944e19c: 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 '1944e19cb1dc82a52d46a42fe8a0ed4037602565':
|
10 years ago |
Bill Yi
|
c1a565c4d0
|
am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
* commit '7f3f30e96965e7189430e4acc53520275627264c':
|
10 years ago |
Jeff Davidson
|
d777adae82
|
am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
* commit '7bf587289933768ada48e79cf43deecfad65c576':
|
10 years ago |
|
Max Cai
|
6745fbb9ea
|
am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':
|
10 years ago |
|
Max Cai
|
2e738aa77c
|
am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':
|
10 years ago |
|
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':
|
10 years ago |
|
Wink Saville
|
9378b718d1
|
am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':
|
10 years ago |
|
Max Cai
|
dd49d0a1e9
|
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
Fix access around unknownFieldData.
|
10 years ago |
|
Max Cai
|
e57ee765da
|
am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
Keep pointers to extension values.
|
10 years ago |
|
Ying Wang
|
11985d9b4e
|
am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
* commit 'cca3823db855ecbcad350332a274f253be7e9662':
|
10 years ago |
|
Baligh Uddin
|
3d5bce541d
|
am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
* commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
|
10 years ago |
|
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':
|
10 years ago |
|
Wink Saville
|
8836d129d1
|
am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
* commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
|
10 years ago |
|
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':
|
10 years ago |
|
Bill Yi
|
3b3f9c919a
|
am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
* commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
|
10 years ago |
|
Jeff Davidson
|
87e6efa134
|
am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
* commit '3656cc20c8a569964d0450ce3207b651c007c35c':
|
10 years ago |
|
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':
|
10 years ago |
|
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':
|
10 years ago |
|
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':
|
10 years ago |
|
Wink Saville
|
cb06adc62f
|
am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
* commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
|
10 years ago |
|
Max Cai
|
34623821a6
|
am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
* commit '55ef21bca9802af2a9aadd593cc606706b13f8da':
Fix access around unknownFieldData.
|
10 years ago |
|
Max Cai
|
a476440cb4
|
am f39998c2: am daf63839: Merge "Keep pointers to extension values."
* commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9':
Keep pointers to extension values.
|
10 years ago |
|
Ying Wang
|
6a4c81a12c
|
am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
* commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
|
10 years ago |
|
Baligh Uddin
|
e083bdfa41
|
am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
* commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
|
10 years ago |
|
Wink Saville
|
39c59c2faa
|
am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
* commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
|
10 years ago |
|
Wink Saville
|
0554e65973
|
am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
* commit 'd1439291d0a2d6558903205676d41410c319587e':
Revert "Merge commit 'e887563a' into fix-merge-conclict"
|
10 years ago |
|
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':
|
10 years ago |
|
Bill Yi
|
eb0cd10027
|
am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
* commit '0e54db6b8ac292b4193a924176a939d4326e803b':
|
10 years ago |
|
Jeff Davidson
|
b04e9a7b37
|
am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
* commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
|
10 years ago |
|
Max Cai
|
748d761e0b
|
am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
* commit '3af26f43dc55563842cee8604f1e802bf40a2585':
|
10 years ago |
|
Max Cai
|
1778b679a8
|
am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
* commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
|
10 years ago |
|
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':
|
10 years ago |
|
Wink Saville
|
60166506e9
|
am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
* commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
|
10 years ago |
|
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':
|
10 years ago |
|
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':
|
10 years ago |
|
Max Cai
|
88c2ee3798
|
am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
* commit '339f5a6db8053b4095af6454250e246ffeb8b295':
|
10 years ago |
