summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:44:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:44:04 -0800
commite2bb5c459608224989dd3f9d5c462790c5f92332 (patch)
tree6e782e265e4b0524c9f04454d2933891c26fae48
parent244493eb9dcf1785dfa8cb5565ffd82aff7ae678 (diff)
parentfcdc30736467201cc8b7b365a969f4db75c44637 (diff)
downloadandroid_packages_wallpapers_MagicSmoke-e2bb5c459608224989dd3f9d5c462790c5f92332.tar.gz
android_packages_wallpapers_MagicSmoke-e2bb5c459608224989dd3f9d5c462790c5f92332.tar.bz2
android_packages_wallpapers_MagicSmoke-e2bb5c459608224989dd3f9d5c462790c5f92332.zip
am fcdc3073: reconcile main tree with open-source eclair
Merge commit 'fcdc30736467201cc8b7b365a969f4db75c44637' into eclair-plus-aosp * commit 'fcdc30736467201cc8b7b365a969f4db75c44637': Add uses-feature for live wallpapers. android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions