tree cba62d0d64153aa2169651696bc238591341d679
parent f881df2a420687a06840db7de52906108f0a50a0
parent 382726b7ee5703f6e428ff8e0223a0650e1decda
author Michael Jurka <mikejurka@google.com> 1414085359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085359 +0000

am 382726b7: am b15e9f89: am 550d5869: am da6ab129: Merge "Use new default wallpaper API" into jb-ub-now-jetsonic

* commit '382726b7ee5703f6e428ff8e0223a0650e1decda':