| commit | 590caeedbd07ae84da361e223a98ddfd56cc1385 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:40:23 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:40:23 2010 -0800 |
| tree | 8ab0f61626e838acbc24707c6415acf1aeb208d6 | |
| parent | ac2c10c2419a2fd8686f62f4e20dff19f5e8cc72 [diff] | |
| parent | edffb2814b483a30da0a922c9135b5acdaaccefc [diff] |
am 217f8ef4: reconcile main tree with open-source eclair Merge commit '217f8ef4c1c151c63382dc0785edd960c233f62e' into eclair-plus-aosp * commit '217f8ef4c1c151c63382dc0785edd960c233f62e': android-2.1_r1 snapshot