aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 68d93707: am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ↵Max Cai2015-03-200-0/+0
|\ | | | | | | | | | | ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit '68d93707a2112c3ab9c756146e6deddeaa837983':
| * am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am ↵Max Cai2014-08-210-0/+0
| |\ | | | | | | | | | | | | | | | 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit 'a61b2ef1d7b372b858b6aae07cf3eebbf62184b8':
* | \ am 4a1053a6: am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit '4a1053a6edd4c2dccbeb32ff4a48f186c0d59c23':
| * | am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit '056670c92d2a1420accbb07e636b895d925df2a1':
* | \ \ am 344082e2: am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit '344082e26086119c467ced1ebf31398e64fa7f1f':
| * | | am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 570db0e9: am c4a1b547: Merge "Add reftypes field generator option." * commit '73789372578a45ceae125e2f66254988ac7eed73':
* | \ \ \ am c3e15291: am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit 'c3e152919fda9e43fbad1ff4a62a9e2d6838e3ee':
| * | | | am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function" * commit '8973d9e63f9f972d646b07719d9292752e3aa382':
* | \ \ \ \ am 2f23eb57: am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit '2f23eb57f21af3a72e963b12ce55528dde067641':
| * | | | | am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled." * commit 'd8fbc18826e4945c45b22b5d36d5e07deb08bf0a':
* | \ \ \ \ \ am 34ae47e2: am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit '34ae47e220c58578df1ca6edc9f7eed23debff55':
| * | | | | | am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option." * commit '8877603f0c61a959ef667df563429589f3a71cc0':
* | \ \ \ \ \ \ am 62379d79: am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit '62379d790c1f33132185174dc73e8e36e032e08c':
| * | | | | | | am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields." * commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':
* | \ \ \ \ \ \ \ am b9c0728c: am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit 'b9c0728c4a1fedff1e9a6ab25eac3b0340b1ee10':
| * | | | | | | | am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4" * commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':
* | \ \ \ \ \ \ \ \ am 6595b4bd: am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am ↵Ulas Kirazci2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '6595b4bd220dd50da9868a4364e1ce34395a9716':
| * | | | | | | | | am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am ↵Ulas Kirazci2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano." * commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':
* | \ \ \ \ \ \ \ \ \ am 0f5795bd: am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am ↵Adam Metcalf2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 380d1b5a: Fix the merge conflict leftovers. * commit '0f5795bdbe62cf56c7ec8a5802ed82749d33794a':
| * | | | | | | | | | am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the ↵Adam Metcalf2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge conflict leftovers. * commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':
* | \ \ \ \ \ \ \ \ \ \ am f091cdfb: am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit 'f091cdfbea53190d0bd72cc0feb1da9634704268':
| * | | | | | | | | | | am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7632e0ad: Merge commit \'11c3b27d\' into fix-mc * commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
* | \ \ \ \ \ \ \ \ \ \ \ am 5e93722a: am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '5e93722ae156871e4c4e7df1f5f28936b68f299f':
| * | | | | | | | | | | | am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':
* | \ \ \ \ \ \ \ \ \ \ \ \ am 42f3fd77: am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '42f3fd77fc8468420e747cba849e959432d84ef3':
| * | | | | | | | | | | | | am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am a55aae90: am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit 'a55aae90f695ea80b4c9d139ac41585e760528a2':
| * | | | | | | | | | | | | | am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." * commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1978393d: am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am ↵Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit '1978393dd2773ce523f35c15007b5ad91c5f25c2':
| * | | | | | | | | | | | | | | am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7b778b9: Merge "Fix outer classname for javamicro/javanano." * commit 'a94fe6cb54165b8139b719f287cdad4973f93643':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0f36c619: am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am ↵Ying Wang2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit '0f36c61953ea1ba726aabb4fa81cd77b43784cb1':
| * | | | | | | | | | | | | | | | am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am ↵Ying Wang2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" * commit 'b09fd32de981b889f973de772a696cef47162ebf':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 682363bc: am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2015-03-201-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '682363bcf6addd6cdb822bc0fed5cd724ffe957d': Fix how getRepeatedFieldArrayLength works
| * | | | | | | | | | | | | | | | | am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2014-08-071-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c': Fix how getRepeatedFieldArrayLength works
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2014-08-051-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Fix how getRepeatedFieldArrayLength worksMax Cai2014-07-031-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01921eff008a8e3f7b1fbeb653d15ff8038d3220
* | | | | | | | | | | | | | | | | | | | am d3518087: am f91b7fa1: Fix build, by using external/zlib instead of ↵Sam Hasinoff2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system zlib * commit 'd35180871e469a79f0bec638693864f037ba4f2f':
| * | | | | | | | | | | | | | | | | | | am f91b7fa1: Fix build, by using external/zlib instead of system zlibSam Hasinoff2014-08-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea': Fix build, by using external/zlib instead of system zlib
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3c1dbbae: am 4d11e705: Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2015-03-202-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c1dbbae095cd8f4c354cf24e27c615c8e160bdc': Fix the aprotoc target for Windows.
| * | | | | | | | | | | | | | | | | | | | am 4d11e705: Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-312-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d11e705cb073e55283452e6fd50e3feff54f82c': Fix the aprotoc target for Windows.
| | * | | | | | | | | | | | | | | | | | | Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-292-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-282-1/+5
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
* | | | | | | | | | | | | | | | | | | | | am f9b409e3: am 95d99df4: Merge "Don\'t return NULL from ↵Brian Duff2015-03-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {Boxed}PrimitiveTypeName." * commit 'f9b409e35963a357985ee687d096f8c166e0b80e': Don't return NULL from {Boxed}PrimitiveTypeName.
| * | | | | | | | | | | | | | | | | | | | am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-221-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95d99df4574c28debcf9646056a0350ff44bc7c9': Don't return NULL from {Boxed}PrimitiveTypeName.
| | * | | | | | | | | | | | | | | | | | | Merge "Don't return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-211-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior of the string ctor is undefined when you pass NULL. This is checked strictly in C++11, so fails to compile. Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
* | | | | | | | | | | | | | | | | | | | | am 60b72a8e: am 11607eb1: Merge "Add a hasExtension method to ↵Max Cai2015-03-202-2/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtendableMessageNano." * commit '60b72a8ef366b27110e8a70caacb2fcd97e1ce92': Add a hasExtension method to ExtendableMessageNano.
| * | | | | | | | | | | | | | | | | | | | am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-182-2/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11607eb10bcf3a46e92257966949d48b28bb7bf3': Add a hasExtension method to ExtendableMessageNano.
| | * | | | | | | | | | | | | | | | | | | Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-172-2/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Add a hasExtension method to ExtendableMessageNano.Juan Silveira2014-07-172-2/+69
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows checking for the presence of an extension without having to deserialize the field. Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1