tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent ee7d3bc92757da0d540eac91400916b5a129aa12
parent 98c3d6c971a3dee26cbf2d49d4c901e516302223
author Daniel Sandler <dsandler@android.com> 1392411126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411126 +0000

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

* commit '98c3d6c971a3dee26cbf2d49d4c901e516302223':