| commit | 86d92827a6af95d376b3e7187b95db75bcb9d4cd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 06:18:50 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 06:18:50 2010 -0700 |
| tree | b3719b3d6d3e1b23addab82e7597eb65a88a4b2b | |
| parent | 297f493405718cbeafa6b47a70f51e09c46ddbb8 [diff] | |
| parent | c7c0eb4619240fbef58411b14819a132bb4172e0 [diff] |
resolved conflicts for merge of 34df5ccc to master Change-Id: I55558b2ab9452b2a819a1fce5b3ee5af29688e98