| commit | e80fbcb19a486400013e85c53b112057fdaa48bb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 01 11:15:13 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 01 11:15:13 2010 -0700 |
| tree | 5f20b6bd9123e1cd6f0ee6c997d41002848142c8 | |
| parent | fb3017ffd8aa3f2342380270cf468e3a68914e69 [diff] | |
| parent | 8adc828f4df3f3856f42750ccf2892ba27c93d86 [diff] |
resolved conflicts for merge of 8adc828f to master Change-Id: I55678d34730df191d541762d4b2025bff2f2460b