tree dea4e3f69aec90057a0f515b7dd51ec44bdb88ec
parent b0fa1d2b99d674799c2627bf626847d1677883cd
parent a888740c5a7325f98e282fdabccc154c93f2daae
author Marco Nelissen <marcone@google.com> 1257895360 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257895360 -0800

am a888740c: am c1664042: Update wallpaper picker to new API

Merge commit 'a888740c5a7325f98e282fdabccc154c93f2daae'

* commit 'a888740c5a7325f98e282fdabccc154c93f2daae':
  Update wallpaper picker to new API