| commit | dec491cf02f1eacedcf9ae0e364783859da28462 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:43:59 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:43:59 2010 -0800 |
| tree | 2ec012fa06311ad0e6b94c9161848be293a3a0fe | |
| parent | c8f77827db779ec070aa77ddc379d5b9157a7f70 [diff] | |
| parent | 37e7e9e052570ea261ac2746bcb41fb907fc1b37 [diff] |
resolved conflicts for merge of 8484e57f to master Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653