| commit | 5dbfdf9928b782c9325864ed1e8dd0ff22ebc286 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 16 14:16:58 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 16 16:16:13 2010 -0700 |
| tree | c242107c1b4eb215a88cc3d09f5d67e140b0d140 | |
| parent | b50d7403816f316fdcaf5b5a318383e64f1a8775 [diff] | |
| parent | e7c06a6eb880bec19bfe43a0ac09ca9c6d20c049 [diff] |
resolved conflicts for merge of e7c06a6e to master Change-Id: If4f2cb14d9a05dc58322732a922e3300ff1a4558