| commit | cfb814bd817511eae4ed0c47113fc111c652ffdf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 18:51:47 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 18:51:47 2010 -0700 |
| tree | 703a2ce182671206ad16a0946a5ad380db08e197 | |
| parent | 5a48825cc0e90dc5386a539f83aa4dcf249b8d53 [diff] | |
| parent | 17c61aaf4607f89e512d883c210cfcc0dc042f4f [diff] |
resolved conflicts for merge of 17c61aaf to master Change-Id: I288054a9e6997ec3e8e2906058b83c7d629a239a