tree fb184119301d92e5b0f88653eb31c4413d54fc0e
parent b6d09a72acfbdbf892bfda3b232f0b3276692b7f
parent 13348ffcffe1403a673747db28102a7a0078b1a6
author Daniel Sandler <dsandler@android.com> 1381690011 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381690011 -0700

am 13348ffc: Merge "Simplify wallpaper strip animation." into jb-ub-now-indigo-rose

* commit '13348ffcffe1403a673747db28102a7a0078b1a6':
  Simplify wallpaper strip animation.