tree 2e16707cbda0993d4ba5a097e2cc850d95ee94d0
parent d3a0ea2a0ca44a54fcc0e1c710eaa29c55d453e9
parent 83a5d38cb6fd7f9f890afb5281937991c71ebd1c
author Dianne Hackborn <hackbod@google.com> 1253206126 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253206126 -0700

am 83a5d38c: Add configuration button to live wallpaper picker.

Merge commit '83a5d38cb6fd7f9f890afb5281937991c71ebd1c'

* commit '83a5d38cb6fd7f9f890afb5281937991c71ebd1c':
  Add configuration button to live wallpaper picker.