| commit | 68d2f95328f262e88bccc02621c3ae5c56128aee | [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 | 7e0bfb82a4d981e4211d8d8104703b6cc11d127c | |
| parent | 7da48db9c5c071cfc1c54a3709a02c1300dccd76 [diff] | |
| parent | 07bacabe747e06e0855a1389cebe20cd60867944 [diff] |
resolved conflicts for merge of 07bacabe to master Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1