| commit | 64696acdd289b55dbcad6901025d11e57e123dd4 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:45:11 2011 -0800 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:45:11 2011 -0800 |
| tree | 6461badf33d039681d28336dfe08f416f35803c1 | |
| parent | 77c98f0230268dc1a5d9293bbe074b07e72f1292 [diff] | |
| parent | cd362a83bfa5c8464b9ab3d44927a05272146737 [diff] |
resolved conflicts for merge of cd362a83 to master Change-Id: I64ce155422530815d2f8deeb4f901c0920f6e68b