| commit | 5d0ec1aebb952601d98c2dad70ef369f75f2b44a | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Jun 24 13:45:26 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Fri Jun 24 13:45:26 2011 +0200 |
| tree | ea2190fc5d1061eacdff540b6d4767f1cb19cb3b | |
| parent | 4839e47309ccefc41d4e7055f701104995472723 [diff] | |
| parent | 972433bdadd74ca7a7b38a04ee648dc0ddde36f6 [diff] |
resolved conflicts for merge of 972433bd to master Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f