| commit | 3b7791c73e941b39764dab810136a6b882401c62 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
| tree | d3ab7b42eae95f1b0ea7b186adf4a1def484babf | |
| parent | 7a49c9129bb36e58169e6460783ecf650123e650 [diff] | |
| parent | c6818784e75173c7edde2fe0af7a50bd8bd86b20 [diff] |
resolved conflicts for merge of 7816eded to gingerbread-plus-aosp Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa