| commit | cf0a198756b4b320a03886b09c8f29db46b3b4af | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:53:19 2011 -0800 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:53:19 2011 -0800 |
| tree | df60b1d5b1aae4af9d50c508c730e0e2b9b47cbb | |
| parent | 64696acdd289b55dbcad6901025d11e57e123dd4 [diff] | |
| parent | cb0d49cd74cd1e1cef4137dad35617c168256d44 [diff] |
resolved conflicts for merge of cb0d49cd to master Change-Id: I0eabcb7b55a0b10f50e2e1f065213223b5600aab