| commit | 70cdb408cb4602b02f0c1e3252a528af74d55436 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 08:08:35 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 08:08:35 2010 -0800 |
| tree | c44546f072ed137f8c29a5ec9e3bd35fa17fd967 | |
| parent | 37ca7defa997360e8e11d78dcafc3609ffe95f5e [diff] | |
| parent | 79ebdf2142ec90b311466ec22d89a38c2971bbf0 [diff] |
resolved conflicts for merge of 73f1d8e4 to master Change-Id: I7a7b3cc68124a0cd3fde220e22a05a914b4c0fce