| commit | 6da54b6e0e0b9daba92562fbf4434887dc1e3528 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Aug 25 23:23:32 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Thu Aug 25 23:23:32 2011 +0200 |
| tree | 636add847c10bdf041cebdd84b6a3462b07c4dc3 | |
| parent | 2bcdfe145d485fc28e86700e4ed57ac67368de25 [diff] | |
| parent | 7be88d00bb26d163b1432ea9a04e07998c26133c [diff] |
resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717