tree aa84e96ec2b3e3b0399a16e4f07ef18482529247
parent 585ec1191ca2b71d00726fd569c582e1f6f34135
parent e436e18739369bfc1c4a1e9cdd42c257aabe5031
author Jean-Baptiste Queru <jbq@google.com> 1346098259 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346098259 -0700

am e436e187: Merge "RS: Water Livewallpaper crashed after setting it to wallpaper several times."

* commit 'e436e18739369bfc1c4a1e9cdd42c257aabe5031':
  RS: Water Livewallpaper crashed after setting it to wallpaper several times.