| commit | 154a320069a316491c25b716f2aeea8c51a758e8 | [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 | a134148c3f13d24f3aca4ebc574899669d3efa63 | |
| parent | 4609b0a8fcfbed9b893301232dfa3b70bb30e4e2 [diff] | |
| parent | 27eecb704a27c1c73ed3449eba0307d8138b9c2e [diff] |
resolved conflicts for merge of 27eecb70 to gingerbread Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1