tree 69cbeae951a12498332b9d50ebbbf17fdadac6bd
parent ec6cae54c1d01244804aa08327904c4c76e1ffe5
parent af99964bc4f0e59ce13283c176dffde5a91356d7
author Adam Cohen <adamcohen@google.com> 1295419654 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295419654 -0800

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

* commit 'af99964bc4f0e59ce13283c176dffde5a91356d7':
  Adding wallpaper picker preview