diff options
author | Marco Nelissen <marcone@google.com> | 2010-02-12 11:33:13 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-12 11:33:13 -0800 |
commit | bc708b62979a1f90e090d16a6a42dc4dc11271a8 (patch) | |
tree | e40351fa5b0a53068635796ecdd8b2de89c66181 /AndroidManifest.xml | |
parent | 1cac273ca3dc02971458785fe4d6d27cfa3f613e (diff) | |
parent | ae9ba5758133ba753bd4a749a81267e08a3ee811 (diff) | |
download | android_packages_wallpapers_MagicSmoke-bc708b62979a1f90e090d16a6a42dc4dc11271a8.tar.gz android_packages_wallpapers_MagicSmoke-bc708b62979a1f90e090d16a6a42dc4dc11271a8.tar.bz2 android_packages_wallpapers_MagicSmoke-bc708b62979a1f90e090d16a6a42dc4dc11271a8.zip |
am ae9ba575: (-s ours) am b7cac95f: DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.
Merge commit 'ae9ba5758133ba753bd4a749a81267e08a3ee811'
* commit 'ae9ba5758133ba753bd4a749a81267e08a3ee811':
DO NOT MERGE. Port live wallpaper changes from Froyo to Eclair for Droid support.
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions