| commit | 456caf3f5f0af673dc120c17c23635f40d8f5ac2 | [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 | 0c7007b18f37e2311147e34b44189ebf487c6991 | |
| parent | 2158db000d227875b12c85c850ec6e3039553f9b [diff] | |
| parent | 1a733a33e1428f577747fcd74dccd8853bd1b29f [diff] |
resolved conflicts for merge of 07bacabe to master Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1