| commit | 546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:31 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:31 2010 -0800 |
| tree | 568e82009b7d4e9f69435e8b1503ebdd8d5cb7c3 | |
| parent | f3935967635a548c20ada56d22429aa814400664 [diff] | |
| parent | d57f7d5f767dcfef8e318427e34e56bdb3da6eb6 [diff] |
am d57f7d5f: reconcile main tree with open-source eclair Merge commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6' into eclair-plus-aosp * commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6': android-2.1_r1 snapshot