| commit | 12902d687fa1bd4bff3c2dfc079c71eacb00eedd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 12:47:12 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 12:51:49 2010 -0800 |
| tree | aa62ab756e61c52df8e02a1ba559da35b04fda11 | |
| parent | 1ee2394edd4b90111f8174862c7c0f435e1a3634 [diff] | |
| parent | 78742e01f73d098076f55cf4f40f0a013a3d88ce [diff] |
resolved conflicts for merge of 78742e01 to stage-korg-master Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905