| commit | 8565a8ebbc26f5d453468bd5acd238e8e00e3629 | [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 | 7a4a53a16ab34989f4a3666afcf89d7bb0545d2a | |
| parent | ae95eaeb432042c617e5d8667b2afa32edb47a68 [diff] | |
| parent | 1a2344b8b2c374cb32ff4af020666e6910ff2a8f [diff] |
resolved conflicts for merge of 1a2344b8 to master Change-Id: I974f7f388ddc74d661f07fda1e308e7c15e00dfc