| commit | ea0f3e9deb05f2a77a616428db0d65d4579d013d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:53 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:53 2010 -0800 |
| tree | 8f576167547291fdea94bea27bd265aafd608db3 | |
| parent | 6f024607366221de07121a6f7a83471d72f225b8 [diff] | |
| parent | a7f85762cded62465c5144679ba8bf5b9986d0c0 [diff] |
am a7f85762: reconcile main tree with open-source eclair Merge commit 'a7f85762cded62465c5144679ba8bf5b9986d0c0' into eclair-plus-aosp * commit 'a7f85762cded62465c5144679ba8bf5b9986d0c0': Add uses-feature to the manifest. android-2.1_r1 snapshot