| commit | a8a21488630980c1d2a2152d0ac39bd7978879e2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 03 15:05:04 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 03 15:05:04 2010 -0700 |
| tree | aa2c3da5f3cfb2eb44933b5126984940b2c02e59 | |
| parent | fcd00ebbdf3e7f4e1e7782a65ae10fb0fc03a1aa [diff] | |
| parent | 7b6e6fa57240466c2728d553be136f800600dd71 [diff] |
resolved conflicts for merge of 7b6e6fa5 to kraken Change-Id: I2b9b80a7fa32c56be2b85ff8be0d6e7ac1848afe