tree 6ac8a4f8e947ddfb383f5ea3e58144c3d64c9dd6
parent 4faad8d612623bc27d3e7ee3ef244828507e25fb
parent 8d60f408802624b35f61d5e068bd13beede7b345
author Winson Chung <winsonc@google.com> 1296071023 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296071023 -0800

am 8d60f408: Merge "Fixing crash in Wallpaper picker. (3392415)" into honeycomb

* commit '8d60f408802624b35f61d5e068bd13beede7b345':
  Fixing crash in Wallpaper picker. (3392415)