tree 72ba604ea9effe67b0210687086b2bffe30c96ee
parent e1c51b1d9399cdfd8c802eca678141ae431060c9
parent e2379d98237369e783359f1c0618e07a47ed6797
author Marco Nelissen <marcone@google.com> 1257824429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257824429 -0800

am e2379d98: am c07c79b1: Update Launcher2 to the new wallpaper API

Merge commit 'e2379d98237369e783359f1c0618e07a47ed6797' into eclair-mr2-plus-aosp

* commit 'e2379d98237369e783359f1c0618e07a47ed6797':
  Update Launcher2 to the new wallpaper API