| commit | e5f0548de90859ea82777a9089f362432ed5f025 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 15:14:57 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 28 15:21:25 2010 -0800 |
| tree | f3d51c2a9818491b3988a89ee85dfef57d391972 | |
| parent | 162d55decd66b5901e85eaa7cbc60d76659ce368 [diff] | |
| parent | 642a0cb05476736ecb19c98eee58c63c04ba37e0 [diff] |
resolved conflicts for merge of bb074ef9 to master Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae