summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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':
generated by cgit v1.1 at 2025-01-25 13:10:50 +0000