| commit | 86e43034a6834a274efefaabefc0dbdd1bbc8d35 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Feb 24 16:15:11 2011 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Thu Feb 24 16:15:11 2011 -0800 |
| tree | 3d66724cf46c80ed1e022ec2c7cbe88ebbf61b62 | |
| parent | be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d [diff] | |
| parent | a4350fc0f3e3a4d4f1893aa000be145287519d99 [diff] |
resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7