| commit | 299bb02887bf49144b248409f54fde6bf07d42b6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 11:05:34 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 11:05:34 2010 -0800 |
| tree | 698cb02fd427600726bba59e577f8eb9669e3b65 | |
| parent | af7bd11e3548d5866e8569461977899d094f21c6 [diff] | |
| parent | 6f55d386c04f32e068d16a371659e0716f3b7914 [diff] |
resolved conflicts for merge of 6f55d386 to stage-korg-master Change-Id: Iba118272eca4153897681f42ed013c8c34de0f30