| commit | f0b77594116f68108ae2095e1ed2d0be66cd839b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:09:11 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:11 2010 -0800 |
| tree | 2e1999adc0f47db8e81155111cdcf313175bc934 | |
| parent | 470366e23a1818906f837b3bcb17703b2ee9be96 [diff] | |
| parent | f06e372cf9be356721abfc32ff2752e452dcebbd [diff] |
am f06e372c: am c13fbca9: reconcile main tree with open-source eclair Merge commit 'f06e372cf9be356721abfc32ff2752e452dcebbd' * commit 'f06e372cf9be356721abfc32ff2752e452dcebbd': Add uses-feature for live wallpaper sample. android-2.1_r1 snapshot