| commit | a23576889d6cef873d8cf16c7520d50042daa384 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:17:37 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:17:37 2010 -0800 |
| tree | bb8819642c406973156976ccde649407927dea05 | |
| parent | 6e42d3ffe6d9b647a7632d989a4755aae1c90617 [diff] | |
| parent | 82b2a4b94c52846128ea57afe27b388d4869b0bd [diff] |
resolved conflicts for merge of ee27dd35 to master Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7