| commit | 10df27a2b127322175bcf49a57ef8c7b0a2b2fcb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Apr 12 09:21:59 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Apr 12 09:21:59 2012 -0700 |
| tree | 16fe096a3a3649f37fb5bf4299ae5bd8d5e5b172 | |
| parent | 6d820c386f521231ba643c5be5599f9f64859df3 [diff] | |
| parent | 447b97434ae71a6e9b4b833468c1d705ad68a2b4 [diff] |
resolved conflicts for merge of 447b9743 to master Change-Id: Iffc8b1a0e373d5819948053610ac0b346f096172