| commit | fae89a5076867dd2ab4d73abd959bbbf32a23336 | [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 | 1828739c054617c3bfa5cb08c15e109c60faa99b | |
| parent | 3c41ac797afc9065897af3cdda870b0cc3f3d045 [diff] | |
| parent | 3436320d8fbd675ac5c46944a0428fbcd7aecc02 [diff] |
resolved conflicts for merge of 4b94c451 to stage-korg-master Change-Id: I07b974f96ca598677e58623050e4668822e68f23