| commit | 3d7ab176d606918c4db0fd07aeda46769b6eb8f1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 02 07:46:21 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 02 07:46:21 2010 -0700 |
| tree | c71966e3d057814e7adba972d5303467e10011dd | |
| parent | 39cae6e02b0267b6a578b0ba346b96af482a1434 [diff] | |
| parent | f601ce2c1455cbfee3289309d20e55172df71bf6 [diff] |
resolved conflicts for merge of f601ce2c to master Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7