| commit | c4e6d563c3ae57e237952b82ad20ee693dfbf9d1 | [log] [tgz] |
|---|---|---|
| author | Owen Lin <owenlin@google.com> | Fri May 14 14:31:06 2010 +0800 |
| committer | Owen Lin <owenlin@google.com> | Fri May 14 14:39:49 2010 +0800 |
| tree | 1a64661f285ae6ddb745ce0dd07a1b1de33ad17f | |
| parent | bef57e1d1fbb1881a7e3a22bb7567e8e7c2f0795 [diff] | |
| parent | ec1dfcb7314d10ff243a922fe4eff66ea699dd77 [diff] |
resolved conflicts for merge of ec1dfcb7 to kraken Change-Id: I5ea57293d0b34f4189983c7a9851555bcf5f5232