| commit | 0aebca93de0b859c432625bf2d31826e7bb268a3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 16:15:19 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 16:15:19 2010 -0700 |
| tree | 559eeaf0eaf27408699d5b846e23649297ceb8f6 | |
| parent | 015f40191715178ad7f355394d6b465f261d2b72 [diff] | |
| parent | ab1a9ded1a822b48c947e043d4092bede0d3fddf [diff] |
resolved conflicts for merge of 8a76a908 to master Change-Id: I8983d5c93dfa12d87449ac9f9a17a5aafdadef0a