| commit | 26e315785d9a1c48e7590ccc1f59d8b7211e39f4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 14 13:09:49 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 14 13:09:49 2012 -0800 |
| tree | 47a08487908068b92a84b9279059cae2a95dd149 | |
| parent | ad0987c33b70a9e60c08f81faadde377ce84acd1 [diff] | |
| parent | 3ad1145a8f055eee0c4eff18606edf611c9dc7f6 [diff] |
resolved conflicts for merge of 3ad1145a to master Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558