tree 8a99b9dc403d825716d0a6ca1e67d962ab9eb39d
parent 534978f7d5ec590874d1311b12704b4d82aaee65
parent d5c55ff10ba1caaa29aa440f4e18f325e8a9c1d9
author Marco Nelissen <marcone@google.com> 1257824655 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257824655 -0800

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

Merge commit 'd5c55ff10ba1caaa29aa440f4e18f325e8a9c1d9'

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