tree 10da860fcff71886af91d082e31f0e1917926848
parent 37a9b3eca5b6205f1db6a2d78c354f92406202f6
parent ad1e4b04d17ed84dbd917cee09c5aa033ca13133
author Daniel Sandler <dsandler@android.com> 1414566268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566268 +0000

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

* commit 'ad1e4b04d17ed84dbd917cee09c5aa033ca13133':