tree cba62d0d64153aa2169651696bc238591341d679
parent 96a3f90c9a0d34cc58592b5954986551645696c2
parent 0b33d00d0da5242682fed968015aaf7aa276d3de
author Adam Cohen <adamcohen@google.com> 1414085465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085465 +0000

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

* commit '0b33d00d0da5242682fed968015aaf7aa276d3de':