| commit | ecb1d5ded9afee63735dc91cfb08ada2c639d237 | [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 | f56b9c03881dc63bf304f6a889677f8dea68a032 | |
| parent | 7d73206ab263e1114b4711912ac3eb786f91b6c5 [diff] | |
| parent | f00ee0f76260a660cd9648d3bda9863e133cb401 [diff] |
resolved conflicts for merge of f00ee0f7 to master Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c