| commit | 5002433ba8c12bc7f373e402bf69fea8f1dfed76 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 24 06:08:24 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 24 06:08:24 2010 -0700 |
| tree | 0aa105ee9750beddc81b074a16252893609e2a1b | |
| parent | dd15bec71f23ad3364c4ae62fc47213dc976e861 [diff] | |
| parent | cd3bd7402f64873ea8dc23d5a6c53b1733373347 [diff] |
resolved conflicts for merge of cd3bd740 to master Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5