| commit | 37d09899c16adf029c688ae5c1cb31bfd9384603 | [log] [tgz] |
|---|---|---|
| author | Konstantin Lopyrev <klopyrev@google.com> | Tue Aug 10 21:47:34 2010 -0700 |
| committer | Konstantin Lopyrev <klopyrev@google.com> | Tue Aug 10 21:47:34 2010 -0700 |
| tree | 350f06ee295c61fdb5b3f03049e08141652295bd | |
| parent | 4df98fc1124faf0003aee9b9c727670fb01c8fa3 [diff] | |
| parent | c448d4a6ae1ab3f8e06eed2e9fc0ed11c802a4d7 [diff] |
resolved conflicts for merge of f00ee0f7 to master Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c