OSDN Git Service

am f06e372c: am c13fbca9: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:09:11 +0000 (14:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:09:11 +0000 (14:09 -0800)
commitf0b77594116f68108ae2095e1ed2d0be66cd839b
tree2e1999adc0f47db8e81155111cdcf313175bc934
parent470366e23a1818906f837b3bcb17703b2ee9be96
parentf06e372cf9be356721abfc32ff2752e452dcebbd
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