| commit | 2338f48ddb3d1746c2d46df85fdc4dcd6cfa240b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 06:18:50 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 06:18:50 2010 -0700 |
| tree | e046cdbfa5bcb565b3ff3327a4b99250bedb85cb | |
| parent | 0ca7aae911be0a9585cafce6eb614b3d69607e10 [diff] | |
| parent | 34df5ccca4c31d131eccc96c2ebf5cc698edfe21 [diff] |
resolved conflicts for merge of 34df5ccc to master Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98