| commit | 4106645061cc392339dce5d9d4b9b23727fba4b8 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sat Aug 21 13:50:54 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Sun Aug 22 11:57:58 2010 -0700 |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf | |
| parent | 151227e77ecbefa90450d72939aa9d4b0f82a685 [diff] | |
| parent | 27fb44291b9170abd2f2e1c8c52f439447aace0e [diff] |
resolved conflicts for merge of a842d143 to master Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b