summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-21am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension ↵Max Cai8-256/+920
values." * commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a': Keep pointers to extension values.
2014-08-21am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the ↵Ying Wang0-0/+0
global WITH_DEXPREOPT * commit 'cca3823db855ecbcad350332a274f253be7e9662':
2014-08-21am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset ↵Baligh Uddin0-0/+0
to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
2014-08-21am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit ↵Wink Saville0-0/+0
\'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '1f8913765270e9d90ad7384156629e116236355d':
2014-08-21am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into ↵Wink Saville0-0/+0
fix-merge-conclict" * commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
2014-08-21am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am ↵Jan-Willem Maarse0-0/+0
58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
2014-08-21am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ↵Bill Yi0-0/+0
ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
2014-08-21am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for ↵Jeff Davidson0-0/+0
merge of 592b6078 to master * commit '3656cc20c8a569964d0450ce3207b651c007c35c':
2014-08-21am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am ↵Max Cai0-0/+0
829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
2014-08-21am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ↵Max Cai0-0/+0
ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
2014-08-21am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ↵Wink Saville0-0/+0
ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
2014-08-21am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into ↵Wink Saville0-0/+0
fix-merge-conflict * commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
2014-08-21am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai8-256/+920
* commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9': Keep pointers to extension values.
2014-08-21am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global ↵Ying Wang0-0/+0
WITH_DEXPREOPT * commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
2014-08-21am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to ↵Baligh Uddin0-0/+0
1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
2014-08-21am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into ↵Wink Saville0-0/+0
fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
2014-08-21am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"Wink Saville0-0/+0
* commit 'd1439291d0a2d6558903205676d41410c319587e': Revert "Merge commit 'e887563a' into fix-merge-conclict"
2014-08-21am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am ↵Jan-Willem Maarse0-0/+0
d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
2014-08-21am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge ↵Bill Yi0-0/+0
commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '0e54db6b8ac292b4193a924176a939d4326e803b':
2014-08-21am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of ↵Jeff Davidson0-0/+0
592b6078 to master * commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
2014-08-21am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ↵Max Cai0-0/+0
--ignore_service nano proto compiler flag" * commit '3af26f43dc55563842cee8604f1e802bf40a2585':
2014-08-21am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge ↵Max Cai0-0/+0
"Don\'t reset cachedSize to 0 in getSerializedSize" * commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
2014-08-21am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge ↵Wink Saville0-0/+0
"Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
2014-08-21am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflictWink Saville0-0/+0
* commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
2014-08-20am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ↵Wink Saville0-0/+0
ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
2014-08-20am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am ↵Wink Saville0-0/+0
51ef8f39: Merge "Fix compile error on mac 10.9" * commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
2014-08-20am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am ↵Max Cai0-0/+0
afc1553a: Merge "Extension overhaul." * commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
2014-08-20am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am ↵Max Cai0-0/+0
447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
2014-08-20am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of ↵Jie Dai0-0/+0
6965d891 to klp-modular-dev-plus-aosp * commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
2014-08-20am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am ↵Max Cai0-0/+0
a8af729b: Merge "Allow whitespace in nano codegen options." * commit '5843426abfdb490874f9d523dac04a825580c7af':
2014-08-20am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am ↵Max Cai0-0/+0
4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'd043ff9d86baa219256036053f09dc5190f38f63':
2014-08-20am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am ↵Max Cai0-0/+0
d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
2014-08-20am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am ↵Andrew Flynn0-0/+0
e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '3628a851ca99c7b2058702aad9bb97f408513e56':
2014-08-20am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am ↵Max Cai0-0/+0
3f9bd998: Merge "Avoid class initializers to help ProGuard." * commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':
2014-08-20am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am ↵Max Cai0-0/+0
cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods" * commit '01d1cdebf2de82c31ccd98909530213c489809a7':
2014-08-20am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am ↵The Android Open Source Project0-0/+0
b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD * commit '23b66756ffe59505358b83f93ebe5880eb1be702':
2014-08-20am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am ↵The Android Open Source Project0-0/+0
c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD * commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':
2014-08-20am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am ↵Max Cai0-0/+0
f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields." * commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':
2014-08-20am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am ↵Max Cai0-0/+0
3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat." * commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':
2014-08-20am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am ↵Max Cai0-0/+0
332076f0: Merge "Fix warnings warnings in header files, hide others." * commit '8948d605872d310771d1e9e73669778660a6b787':
2014-08-20am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ↵Max Cai0-0/+0
ac8e2e15: Merge "Minimize method count for nanoproto." * commit 'dce52afd8eb043950cbfac7e057362918159b07f':
2014-08-20am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am ↵Max Cai0-0/+0
8a15121c: Merge "Allow for ref-type arrays containing null elements." * commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':
2014-08-20am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am ↵Max Cai0-0/+0
bb971d53: Merge "Implement hashCode() and equals() behind a generator option." * commit 'e668f0c3a996574010b60daa74823bfa9429dcda':
2014-08-20am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am ↵Max Cai0-0/+0
42be1e79: Merge "Feature request: set() and clear() accessors return this" * commit '74b536a558743acacb10e00aced05e59249a76bc':
2014-08-20am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am ↵Max Cai0-0/+0
c50f605c: Merge "Make generated code more aligned with Google Java style." * commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':
2014-08-20am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am ↵Max Cai0-0/+0
afaf74ce: Merge "Fix repeated field merging semantics." * commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':
2014-08-20am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am ↵Max Cai0-0/+0
63e819ad: Merge "Protect against null repeated fields." * commit 'bd188bc73c8d0f6214192b66780764cf4315530e':
2014-08-20am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am ↵Max Cai0-0/+0
c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge * commit '4734b9898c715a060e3d4f56ddf79be9fc6f2d1e':
2014-08-20am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am ↵Max Cai0-0/+0
39cee9f1: Merge "Remove all field initializers and let ctor call clear()." * commit 'e90564050f017e6e5d78ed5328c21a2b445e1122':
2014-08-20am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am ↵Ulas Kirazci0-0/+0
cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" * commit 'e655a86220da5f0e3a5135a0cf82ac4e114a2466':