| commit | 8fb1869d39b6c2579e7fca3c1cbc557cc1faf88d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 30 12:08:31 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 30 12:08:31 2010 -0700 |
| tree | af4027db8a177b93c6943b4a106a759052d4223c | |
| parent | c080e5e5232edc3e5b6fe879d6c1b643de68168d [diff] | |
| parent | 7b8a2361cef04d38e45a08ad3927a66b644d3c97 [diff] |
resolved conflicts for merge of 27eecb70 to gingerbread Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1