| commit | d1e0e1f2cfb6b9c1b7835bb996fa36f600d6fbe4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 20 09:24:19 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 20 09:24:19 2012 -0700 |
| tree | cbc93f139cb5c94ede18ce99ebd7604149261fe3 | |
| parent | 091db3f5a8048cd7f9ec78b410e450fdf774903e [diff] | |
| parent | 3d7af22db5efc12fc94e4f93dca9752a53a4d7be [diff] |
resolved conflicts for merge of 3d7af22d to master Change-Id: I41b002c6ef2de26d02912da9c1031d625fbbad4d