| commit | f79f476fd1e25d3d7bf77e890d064a503537e939 | [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 | cf6ca3a7996cefd94c0d0d30ae834f4d2e27b7a4 | |
| parent | 5b9c79f27ee1bfc1ab70770b55dc10e24988a42a [diff] | |
| parent | c00d2ddcc343b7bcdce30925df90523bb7371f83 [diff] |
resolved conflicts for merge of c00d2ddc to master Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62