summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:43:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:43:02 -0800
commit20c7cfb334124a537c281c32cc8a13ec37d5957c (patch)
tree47a404d1d21c8b5b542d6c0a29e7dc6ce9b7aa08 /AndroidManifest.xml
parentaf6154f52bb590f20f3700e1635776a76b805891 (diff)
parente5a8ce6f767a05dae004b1aab912fa681aca685a (diff)
downloadandroid_packages_wallpapers_LivePicker-20c7cfb334124a537c281c32cc8a13ec37d5957c.tar.gz
android_packages_wallpapers_LivePicker-20c7cfb334124a537c281c32cc8a13ec37d5957c.tar.bz2
android_packages_wallpapers_LivePicker-20c7cfb334124a537c281c32cc8a13ec37d5957c.zip
am e5a8ce6f: reconcile main tree with open-source eclair
Merge commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a' into eclair-plus-aosp * commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a': android-2.1_r1 snapshot
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions