| commit | 1b967a1b23cd237d3df49f7b0e0af771c8aef077 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Wed Nov 13 18:43:32 2013 -0800 |
| committer | Svetoslav <svetoslavganov@google.com> | Wed Nov 13 18:43:32 2013 -0800 |
| tree | f47e8c6692808f93ab445278b3da1de68d00e15f | |
| parent | ef6a8aeb43d076653f6d30e69f0c21cb2041cf10 [diff] | |
| parent | 9358d98d83dc79734ca2da00a371e0966e9ddfe1 [diff] |
resolved conflicts for merge of 9358d98d to master Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3