| commit | bda00faca828fd9e537972de059ba0e96e7eff56 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 17 17:31:25 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 17 17:31:25 2010 -0800 |
| tree | ed68a85d29dc6c8b8f72b947b778186e6f871579 | |
| parent | 28462eb7a6cba60f933fca65975e13c510859ab3 [diff] | |
| parent | d5b427b7090df3476a71ac1a50ffe1178bf30565 [diff] |
resolved conflicts for merge of 1a2344b8 to master Change-Id: I974f7f388ddc74d661f07fda1e308e7c15e00dfc