| commit | 96713431bbeb5270b545b160da1e3f6167835d0b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 02 12:05:24 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 02 12:06:03 2010 -0700 |
| tree | bc493772819bb2ce5abc7dca3863c7366d3c1f10 | |
| parent | 7da46cbd2ee1f5f7973a5e4332cc6389e696110b [diff] | |
| parent | 5ea5bedd17ba874b4e1636469a9c6f7c4eabb9c8 [diff] |
resolved conflicts for merge of 5ea5bedd to master Change-Id: I3238fb8cf7fcf6a20c53b59e27bcb68af7d44060