tree 5b69de4e26abbdd0de919c4befbab93cb9b7bfdf
parent b9d3cbef4bec89615765d9024f0ff98a6636544a
parent 25c646f0f0484362b9aa1b804e8592a8bd469ce0
author Adam Cohen <adamcohen@google.com> 1295419517 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295419517 -0800

am 25c646f0: Merge "Adding wallpaper picker preview" into honeycomb

* commit '25c646f0f0484362b9aa1b804e8592a8bd469ce0':
  Adding wallpaper picker preview