am c13fbca9: reconcile main tree with open-source eclair

Merge commit 'c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp

* commit 'c13fbca985b333cfb09d2b29875b36594dd44d64':
  Add uses-feature for live wallpaper sample.
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project
2010-02-05 08:23:01 -08:00
committed by Android Git Automerger

Diff Content Not Available