| commit | 01e7a68fd0a143c2f12d29b4085b2f72347c49e7 | [log] [tgz] |
|---|---|---|
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Wed Oct 28 17:21:53 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 28 17:21:53 2009 -0700 |
| tree | 80b25d90d1e024270036c5f098de6dc3b4fefc3e | |
| parent | 110dd46414574da42c4f07b629b31977d144a849 [diff] | |
| parent | 8a5d527223414c3c23b8021eb8ed468d3299e968 [diff] |
am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2 Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp * commit '8a5d527223414c3c23b8021eb8ed468d3299e968': Bump version to 2.1 API 6.