tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent 377a60a25e1d8720fbe6c463410ccf69feb8e573
parent 16290220b0ca75a9a519f8edff6f61efd2b48dbf
author Daniel Sandler <dsandler@android.com> 1392410210 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410210 +0000

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

* commit '16290220b0ca75a9a519f8edff6f61efd2b48dbf':