| commit | abe9ac919cf3d50d6b05a2f6e14450fd6302c301 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 09:05:02 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 09:05:02 2010 -0700 |
| tree | 927c944a1d260cb0d87c3ba5318166a35c23ae9c | |
| parent | 902c4a66981ea0a89f924f8318ebc7f8b7d33247 [diff] | |
| parent | 10ebf928d808d8dc5d3c1542d7629b16a17dd964 [diff] |
resolved conflicts for merge of 10ebf928 to master Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc