tree cba62d0d64153aa2169651696bc238591341d679
parent 59f5341fab50e09ba14c2bc6ffb63ec83a8328b0
parent 52cdcb1e83e11ed3eb8963c4c9c0dfcae07b7d40
author Michael Jurka <mikejurka@google.com> 1414085396 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085396 +0000

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

* commit '52cdcb1e83e11ed3eb8963c4c9c0dfcae07b7d40':