tree ad769fea97f369fa1fbd55478d0d42f57d0c8452
parent 5ccc25d5a5bb336b26fd4bd4883ca6ddf8a8532e
parent 8355ae39ad77b8e2e9ff3b4cbff8077a002ce151
author Dianne Hackborn <hackbod@google.com> 1252450925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252450925 -0700

am 8355ae39: Add "Configure..." to wallpaper menu for configurable live wallpapers.

Merge commit '8355ae39ad77b8e2e9ff3b4cbff8077a002ce151'

* commit '8355ae39ad77b8e2e9ff3b4cbff8077a002ce151':
  Add "Configure..." to wallpaper menu for configurable live wallpapers.