OSDN Git Service

am 828f0a83: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:43:26 +0000 (08:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:43:26 +0000 (08:43 -0800)
commitaaeb76551421f62f4a3140825faaa70e33a22f0f
treecac835e120d81be74144a7c3821b340abc934353
parenta008553e931ddbe567b4617e837f0f6996b12ed7
parent828f0a830e62d982e7c1685d4d722ae1a962029f
am 828f0a83: reconcile main tree with open-source eclair

Merge commit '828f0a830e62d982e7c1685d4d722ae1a962029f' into eclair-plus-aosp

* commit '828f0a830e62d982e7c1685d4d722ae1a962029f':
  Add uses-feature for live wallpapers.
  android-2.1_r1 snapshot