| commit | a6fa26f83fd7361d961eb41ae943f6d704be3369 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 21 11:44:49 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 21 11:44:49 2010 -0700 |
| tree | 96f7d2aa4c5397d2164f19e0adf22532df1d3041 | |
| parent | 9a76eb568d39827ee46a54d39f5c304b9411bab2 [diff] | |
| parent | 6c9a30045b1e6b9ef5d756e0a9657576c546c9bd [diff] |
resolved conflicts for merge of 6c9a3004 to master Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95