| commit | 2531d6721d91c5463bb8fa36372647dc117530cf | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Wed Dec 16 08:56:19 2009 -0800 |
| committer | Dmitri Plotnikov <dplotnikov@google.com> | Wed Dec 16 08:56:19 2009 -0800 |
| tree | 48b117eabdb16fee64216c942df9fa036806a7c0 | |
| parent | 20a9a57a1803348cf2b764881fae2ff36b51ae42 [diff] | |
| parent | c95b39d352924ed3528e82e689973ca52228ac1a [diff] |
resolved conflicts for merge of c95b39d3 to master Change-Id: I42b2fcaf09d289b88fba4eda7f2e3355ea7183fb