| commit | f2ff9ec7f3b8939a24a051af5d713987094d2302 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Dec 05 13:30:52 2011 -0800 |
| committer | Andreas Huber <andih@google.com> | Mon Dec 05 13:31:17 2011 -0800 |
| tree | b21a43612c5d1debb36d22ccbbd50a5093636c8a | |
| parent | 9fdb20e70366da885f58c0c717ffe2213dfed1d4 [diff] | |
| parent | 8e2bb37d9f135ecdde08d4f7278b8a0b30ce76df [diff] |
resolved conflicts for merge of 07bacabe to master Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1