tree 05a5cbc94fcfe5c7d91a0a92f58becab77244211
parent 81a281579c85bf2a3b64a643fc619c884f2ae38c
parent 0dffdc7ea90919e1c449f5832e952a5ab140ddf8
author Daniel Sandler <dsandler@google.com> 1258575233 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258575233 -0800

am 0dffdc7e: Merge change Iead6e21b into eclair

Merge commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8' into eclair-mr2

* commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8':
  Clean up live wallpaper picker list.