summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am ↵Max Cai2015-03-200-0/+0
|\ | | | | | | | | | | 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
| * am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am ↵Max Cai2014-08-210-0/+0
| |\ | | | | | | | | | | | | | | | 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'c1d044c0b1b97265e3bef096acdaa503d9ec615a':
* | \ am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am ↵Max Cai2015-03-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
| * | am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am ↵Max Cai2014-08-210-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4':
* | \ \ am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am ↵Andrew Flynn2015-03-200-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '18072b1d0063576040575f8970d36f11a8527fbc':
| * | | am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am ↵Andrew Flynn2014-08-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit 'a155ce7ea537b9388e0785d74363f3e11177a5e0':
* | \ \ \ am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit '31111e302e14330c3868e6b1456dbe1e0293edef':
| * | | | am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':
* | \ \ \ \ am 6a8d85c1: am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '6a8d85c1211dd2382df6991db27872de8d990948':
| * | | | | am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '3a324516bd8757996725ac3c28224bc41d5123be':
* | \ \ \ \ \ am f29d4247: am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am ↵The Android Open Source Project2015-03-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit 'f29d4247c76645649c4d205abaa22eeffe1f177d':
| * | | | | | am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am ↵The Android Open Source Project2014-08-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '8d5b7fb23a951dabb95bce445ef588b68e6b0e63':
* | \ \ \ \ \ \ am ca65c1f6: am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am ↵The Android Open Source Project2015-03-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'ca65c1f662624e72dc2e2da0604d869972fc73ce':
| * | | | | | | am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am ↵The Android Open Source Project2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit '6d879b4e0d411dd925978437c43e052cf3fba00e':
* | \ \ \ \ \ \ \ am 93f1f6d3: am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit '93f1f6d36883ec801a0da383550f018f1b2db7b2':
| * | | | | | | | am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'a59cc53b9271c09380769f86846583a94349f390':
* | \ \ \ \ \ \ \ \ am 99a4ceca: am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '99a4cecac63d2ee3d414712268ef2399807d6abd':
| * | | | | | | | | am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '9b07838482cc1c03bf486ea9b5f465d329bb07df':
* | \ \ \ \ \ \ \ \ \ am 58437442: am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '584374426b043bee782144bd58c14f2e612f56ef':
| * | | | | | | | | | am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '2267616c6621b748c8551c9895e47a792ee04cb2':
* | \ \ \ \ \ \ \ \ \ \ am 78d2cc9f: am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit '78d2cc9fb3bf67926d6a2b76e76b6a32bc5d02c5':
| * | | | | | | | | | | am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto." * commit '4b700b8a8b6ed8151aa22b99b2e0dac214e251f3':
* | \ \ \ \ \ \ \ \ \ \ \ am ea0f327a: am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit 'ea0f327a2fa5526267963b6215abb3bbd0e766b4':
| * | | | | | | | | | | | am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit '438ca4a840876afd43ac8cbea4df2130c0629072':
* | \ \ \ \ \ \ \ \ \ \ \ \ am e4a89c5c: am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit 'e4a89c5c42e137fe793ed6ad26618b05188816e7':
| * | | | | | | | | | | | | am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit '17395e556af77b06ea3de454d5c279802ec8cc49':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 405d0f3d: am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '405d0f3dc1a68e94db6006fe5e92a1c9ae09928a':
| * | | | | | | | | | | | | | am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '826b4cf541f3d21f374e2749c48348c6539c6b2e':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f7cab2e5: am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit 'f7cab2e53d8cdef0cda6762fa92c0e4828f87d51':
| * | | | | | | | | | | | | | | am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style." * commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 42a70ce0: am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit '42a70ce03d0527ea9b7a1adcbfd0534f6c317c96':
| * | | | | | | | | | | | | | | | am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics." * commit '03016e747254a97144db2703106787b493fb5014':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8aad5887: am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit '8aad5887d583c502da1ef6b8ab7fe7679e8114aa':
| * | | | | | | | | | | | | | | | | am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf222b76: am 63e819ad: Merge "Protect against null repeated fields." * commit 'fa0eb541ce7abf79b1bf7ba5526d3418d74657ab':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 33f1b41c: am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am ↵Max Cai2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit '33f1b41c95115226f4168f76a5b0b5df391c81d8':
| * | | | | | | | | | | | | | | | | | am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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':