tree 12e90599d461abb09db87f5824e064f9d9a87f49
parent 4bef6b2c56388d3ba442c25888dc9d29310d1144
parent 382726b7ee5703f6e428ff8e0223a0650e1decda
author Michael Jurka <mikejurka@google.com> 1392411604 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411604 +0000

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

* commit '382726b7ee5703f6e428ff8e0223a0650e1decda':
  Use new default wallpaper API