| commit | e78a000955c283509ee8a21b8b7e448060ac8dd8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Dec 13 13:06:13 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Dec 13 13:06:13 2010 -0800 |
| tree | b314a80f3ae6ac3b0e63439f7204e6334f9aa316 | |
| parent | d0ffef4b43594e540cb867da18d4403b4f583622 [diff] | |
| parent | 4b94c451d2c3aea27c007518318ea98671ae6ed3 [diff] |
resolved conflicts for merge of 4b94c451 to stage-korg-master Change-Id: I07b974f96ca598677e58623050e4668822e68f23