| commit | fae998c860e545e35fd3f4a821837409ee9bcb4e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 19:02:41 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 19:02:41 2010 -0700 |
| tree | 90e64e21243caefff0a2394841f4ad9b167f8cc3 | |
| parent | a20e87347605a625d557c4b9c721fb2e560573ee [diff] | |
| parent | 7c08b70c960a9a6d9e59e854b88c0877fe33dc99 [diff] |
resolved conflicts for merge of 7c08b70c to master Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088