| commit | 9da2070b6d6d20550de7da61478c325f0928d020 | [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 | f1548891fab33ca03923f70cf25a2ffeab50be82 | |
| parent | 3be9523784cc4038f601e510faee595117cdacb3 [diff] | |
| parent | efe6039f71e9bac2138003b3287e94a7ab7e5c55 [diff] |
resolved conflicts for merge of 27eecb70 to gingerbread Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1