| commit | 8a5d527223414c3c23b8021eb8ed468d3299e968 | [log] [tgz] |
|---|---|---|
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Wed Oct 28 16:12:11 2009 -0700 |
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Wed Oct 28 16:12:11 2009 -0700 |
| tree | c05aafc2a745302dfb5e66b0a57858f30381d98a | |
| parent | eae4fc960cec88f50eea7ae65f85f5722b0ad26b [diff] | |
| parent | 3fa115999c8512095301724f557821f25ddfe08f [diff] |
resolved conflicts for merge of 3fa11599 to eclair-mr2