| commit | de0076c7782b8feccf4d234e5b96700d6587218b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 17 13:50:32 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon May 17 13:50:32 2010 -0700 |
| tree | a8ff93c42fb45597ef036e11858677c9666692e2 | |
| parent | 4edfe7501873df28554b675694b336579c078dfa [diff] | |
| parent | 5a64b6daec2242f21060e3ea091d27ff17fbe4e8 [diff] |
resolved conflicts for merge of f7fb5331 to kraken Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20