| commit | 9bb9fcaeb1f170c6a91057b495edd463df9062c5 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Fri Oct 28 15:40:32 2011 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Fri Oct 28 15:40:32 2011 -0700 |
| tree | 1d90b398fb949e1e316b658c863f2f87f7814afb | |
| parent | af80315be06dea554231a5fb8d3f603dd14b149c [diff] | |
| parent | d7967f79b3f6790d2f07c90e863d402afb99ac76 [diff] |
resolved conflicts for merge of c00d2ddc to master Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62