tree 10da860fcff71886af91d082e31f0e1917926848
parent 6148557cd064a7979d1d0b4d20a5d5dd14e153cf
parent 7f110bd5ccfae8ded3c5c1468c2284717189035d
author Adam Cohen <adamcohen@google.com> 1414566346 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566346 +0000

am 7f110bd5: am 0b33d00d: am b040fcf5: am a05060c9: am 18238d90: am 3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic

* commit '7f110bd5ccfae8ded3c5c1468c2284717189035d':