| commit | 712e7865b0b3345de0e47dce43bed54ed1bf6420 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 13:24:13 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 13:24:13 2010 -0700 |
| tree | a60073bfe885d132d92c540aa713e0dc0830820a | |
| parent | e1a36a69e8be4f4a063ff1c2ee7650fd4a3e74cd [diff] | |
| parent | 85173cc08ae566cea07467ba4cb81813f275c19a [diff] |
resolved conflicts for merge of 85173cc0 to master Change-Id: I0ac3819b7c8a1822f217817ea6b8471cac24044f