tree 10da860fcff71886af91d082e31f0e1917926848
parent f01e4763c9f5721577dfa5c0b0dd2235aa439fac
parent 17ca9a0caec2ba48461bcc3509302d0483eb25cb
author Michael Jurka <mikejurka@google.com> 1414566283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566283 +0000

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

* commit '17ca9a0caec2ba48461bcc3509302d0483eb25cb':