| commit | 1ace4163fa8015c58b28aaa7b0d8d49bdee654d1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 14:00:27 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 14:00:27 2010 -0700 |
| tree | dfa62c86e543f764649ec598887e5f76a1dd7ec0 | |
| parent | 9ef658ddda46a412fd936284904a1e5253055e75 [diff] | |
| parent | ff749b9a0d1137755ce466ca561b18473911d115 [diff] |
resolved conflicts for merge of ff749b9a to master Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af