| commit | 6c337e7a663c1049e58e0051bd7bfba61614ef37 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Mar 07 11:35:19 2013 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Mar 07 11:35:19 2013 -0800 |
| tree | 6ff7dc38de93972a9c261d1ba57d27a3145beef5 | |
| parent | 3cd153a0330d4234a536fc5f4e4346413bde5a44 [diff] | |
| parent | bfb2aa46529ebe4889940ff2e11e00d38b04aace [diff] |
resolved conflicts for merge of bfb2aa46 to jb-mr2-dev