tree e5e414b24e17789a7b8c146b1b5d17fbf0da46c2
parent a31e954f0a33e810891c8ce199292c17f85b1e98
parent fec0c188ff7ab39b272561ea2e48aafc72c35ded
author Scott Main <smain@google.com> 1340788512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340788512 -0700

am fec0c188: Merge "docs: add info about live wallpaper picker" into jb-dev

* commit 'fec0c188ff7ab39b272561ea2e48aafc72c35ded':
  docs: add info about live wallpaper picker