| commit | d3837ae622513ad149351ed419703b7ca6689e29 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Mon Oct 31 17:22:41 2011 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Mon Oct 31 17:22:41 2011 -0700 |
| tree | fb1d1d4327d156708816a6b188880316f3df5a50 | |
| parent | 6e263925518cd0f84bacdcf40d4915ffd2913241 [diff] | |
| parent | c90e0d59360db5bb1b94712fc87737c9ab2ce475 [diff] |
resolved conflicts for merge of c90e0d59 to master Change-Id: I51f83d9a0df0c9b154936a669e458becec8b38f7