tree fb184119301d92e5b0f88653eb31c4413d54fc0e
parent 80663ba233088474458bf50bd709c8474850e0bc
parent 039a2c118f80d71f0b0dbb065876b310a843a07c
author Daniel Sandler <dsandler@android.com> 1381690115 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381690115 -0700

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

* commit '039a2c118f80d71f0b0dbb065876b310a843a07c':
  Simplify wallpaper strip animation.