| commit | a48d298d1030ab50ebcb410bf5c353c670db966b | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Mon Sep 27 15:33:24 2010 +0900 |
| committer | satok <satok@google.com> | Mon Sep 27 15:33:24 2010 +0900 |
| tree | 2e282d75da0724b07f96c0004d54934048e19e75 | |
| parent | d316b900b0dae4bbc629e3e3c1b68cbebd5bfd1b [diff] | |
| parent | b9c0ed59d0b1565eafbe34d7e38bee7564dbe3fd [diff] |
resolved conflicts for merge of b9c0ed59 to master Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d