tree 7dd4e59783107646a9021c980bf04562d7379c08
parent 067fe8bb8eefc7b7f9dbc29a7f5923adf99d65e8
parent e9246f77fd63ca1040af04242629d6faba2c2b69
author Winson Chung <winsonc@google.com> 1296071139 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296071139 -0800

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

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