| commit | 8503144665894f1b5008f540e0cf36c948c763ef | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:43:59 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:43:59 2010 -0800 |
| tree | 4abec8e4108a344ecd37a1931c97c92d2d2b6698 | |
| parent | eca0f6877d5e6624c181cecec47b62500ce686b9 [diff] | |
| parent | 8484e57f3006dd3aa925792e6414387c233c1a8d [diff] |
resolved conflicts for merge of 8484e57f to master Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653