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:
committed by
Android Git Automerger
commit
f06e372cf9