| commit | 5704f326e00aa2ba8aa9b1df511747f6bd8dc3f7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 08:15:50 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 08:15:50 2010 -0800 |
| tree | 0160d0cf5065911145cd09d60fc39509b7c3ef71 | |
| parent | 70cdb408cb4602b02f0c1e3252a528af74d55436 [diff] | |
| parent | 85e70956eb278761fa358ba2dc281e66b7852dda [diff] |
resolved conflicts for merge of f05f7ab1 to master Change-Id: Id39b4f1f0aefb387261bbe721050814d5517cea1