tree 10da860fcff71886af91d082e31f0e1917926848
parent bb437d174558f404980f6c72011dbbfdd9ffdd0d
parent 6565d9ec042ba9b13c1dd541aac619618cd23a5b
author Michael Jurka <mikejurka@google.com> 1414566306 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566306 +0000

am 6565d9ec: am 52cdcb1e: am 8af8b1c1: am b0e2221f: am 03a526b2: Merge "Stop using a separate ImageView for default wallpaper" into jb-ub-now-jetsonic

* commit '6565d9ec042ba9b13c1dd541aac619618cd23a5b':