tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent fd95a82639623614c4ad8d23ba0dc6e03f29917d
parent 72537b1c745eb22f5bc585cb3bff0abb6c2aecb7
author Daniel Sandler <dsandler@android.com> 1392411594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411594 +0000

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

* commit '72537b1c745eb22f5bc585cb3bff0abb6c2aecb7':