aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around ↵Max Cai2014-08-217-16/+36
|\ | | | | | | | | | | | | unknownFieldData." * commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126': Fix access around unknownFieldData.
| * am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-217-16/+36
| |\ | | | | | | | | | | | | * commit '55ef21bca9802af2a9aadd593cc606706b13f8da': Fix access around unknownFieldData.
| | * am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-07-157-16/+36
| | |\ | | | | | | | | | | | | | | | | * commit 'a88808d414308b5b567d3afaab56fc338ad80667': Fix access around unknownFieldData.
| | | * Merge "Fix access around unknownFieldData."Max Cai2014-07-147-16/+36
| | | |\
| | | | * Fix access around unknownFieldData.Max Cai2014-07-157-16/+36
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of publishing its class I chose to encapsulate the troublesome references in equals()/hashCode() in the generated code into superclass methods in ExtendableMessageNano. Changed a couple of java packages in the test suite to catch this issue easier in the future. Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
* | | | am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension ↵Max Cai2014-08-218-256/+920
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | values." * commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a': Keep pointers to extension values.
| * | | am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai2014-08-218-256/+920
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9': Keep pointers to extension values.
| | * | am daf63839: Merge "Keep pointers to extension values."Max Cai2014-07-158-256/+920
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'daf638399bd42122306786e8062f392ddace4363': Keep pointers to extension values.
| | | * Merge "Keep pointers to extension values."Max Cai2014-07-148-256/+920
| | | |\
| | | | * Keep pointers to extension values.Juan Silveira2014-07-148-256/+920
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of getExtension deserialises the field from bytes and returns a new object every time. This means that changes to those objects are reflected when the messages is serialised unless setExtension is called. It also means that every call to getExtension and setExtension is expensive. This change introduces a FieldData class that contains everything that's known about the field at the time. This can be all the tag/byte[] pairs associated with a given field or an Extension and a value object. This is so that two messages with a repeated extension can be compared even if the extension has been deserialised in one of them but not the other. This change also adds FieldArray class based on SparseArray from the Android compatibility library. This is used in ExtendableMessageNano to make lookup of FieldDatas by their field number faster. Implications: * calling getExtension multiple times deserialises the field only once and returns the same object. * calling setExtension doesn't cause the object to be serialised immediately, that only happens when the container message is serialised. * getExtension is no longer a read-only thread-safe operation. README.txt has been updated to relfect that. * comparison using equals and hashCode continues to work. Bug: 10863158 Change-Id: I81c7cb0c73cc0611a1f7c1eabf5eed259738e8bc
* | | | am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the ↵Ying Wang2014-08-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | global WITH_DEXPREOPT * commit 'cca3823db855ecbcad350332a274f253be7e9662':
| * | | am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global ↵Ying Wang2014-08-210-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | WITH_DEXPREOPT * commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
* | | | am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset ↵Baligh Uddin2014-08-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | to 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
| * | | am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to ↵Baligh Uddin2014-08-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1fd235cbb5975e117909c73e5e3a579ae4c28dce * commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
* | \ \ \ am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '1f8913765270e9d90ad7384156629e116236355d':
| * | | | am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
* | \ \ \ \ am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conclict" * commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
| * | | | | am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1439291d0a2d6558903205676d41410c319587e': Revert "Merge commit 'e887563a' into fix-merge-conclict"
* | \ \ \ \ \ am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am ↵Jan-Willem Maarse2014-08-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
| * | | | | | am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am ↵Jan-Willem Maarse2014-08-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" * commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
* | \ \ \ \ \ \ am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ↵Bill Yi2014-08-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
| * | | | | | | am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge ↵Bill Yi2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '0e54db6b8ac292b4193a924176a939d4326e803b':
* | \ \ \ \ \ \ \ am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for ↵Jeff Davidson2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 592b6078 to master * commit '3656cc20c8a569964d0450ce3207b651c007c35c':
| * | | | | | | | am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of ↵Jeff Davidson2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592b6078 to master * commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
* | \ \ \ \ \ \ \ \ am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am ↵Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" * commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
| * | | | | | | | | am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --ignore_service nano proto compiler flag" * commit '3af26f43dc55563842cee8604f1e802bf40a2585':
* | \ \ \ \ \ \ \ \ \ am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ↵Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
| * | | | | | | | | | am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge ↵Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
* | \ \ \ \ \ \ \ \ \ \ am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
| * | | | | | | | | | | am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge ↵Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
* | \ \ \ \ \ \ \ \ \ \ \ am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into ↵Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-merge-conflict * commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
| * | | | | | | | | | | | am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflictWink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
* | \ \ \ \ \ \ \ \ \ \ \ \ am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ↵Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
| * | | | | | | | | | | | | am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge ↵Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t reset cachedSize to 0 in getSerializedSize" * commit 'de6420aa3fef9f6f85e88fd8e0c7667230d81753':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am ↵Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51ef8f39: Merge "Fix compile error on mac 10.9" * commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
| * | | | | | | | | | | | | | am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix ↵Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compile error on mac 10.9" * commit 'c8f69926325e0653ba4244dbd041c2d29b784194':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afc1553a: Merge "Extension overhaul." * commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
| * | | | | | | | | | | | | | | am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Extension overhaul." * commit '9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447f664a: Merge changes I9fecff3c,I2c1eb07f * commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
| * | | | | | | | | | | | | | | | am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes I9fecff3c,I2c1eb07f * commit '0eaea6a8d71e3b323f2fe3bccb3829162c04e33c':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of ↵Jie Dai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6965d891 to klp-modular-dev-plus-aosp * commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
| * | | | | | | | | | | | | | | | | am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to ↵Jie Dai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '0ce2c26133762a55c52c0262bbe393370b806276':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8af729b: Merge "Allow whitespace in nano codegen options." * commit '5843426abfdb490874f9d523dac04a825580c7af':
| * | | | | | | | | | | | | | | | | | am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Allow whitespace in nano codegen options." * commit '0c063c66604c5dee434534ff775eb6d18ce4ed7b':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==." * commit 'd043ff9d86baa219256036053f09dc5190f38f63':
| * | | | | | | | | | | | | | | | | | | am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Correctness: floating point equality using bits instead of ==." * commit '06396abfe648b84e4c17d0e4a98a6cd34d57aaab':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am ↵Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
| * | | | | | | | | | | | | | | | | | | | am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge ↵Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t serialize required fields whose \'has\' flags are unset." * commit 'e41d4c041cb2c6d58c4508cf792cd4e987991b2a':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am ↵Andrew Flynn2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7741c06: Merge "Fix MessageNanoPrinter for accessors" * commit '3628a851ca99c7b2058702aad9bb97f408513e56':
| * | | | | | | | | | | | | | | | | | | | | am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix ↵Andrew Flynn2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageNanoPrinter for accessors" * commit '11b030c32e2b740283ddd455e1e29748667cf314':