tree d779709aa3b162cace54185928ea8177ed915d75
parent 48103be6a2810d6d370b320894a892efe98db61c
parent 41297ff82c94d28fe19a6dd8f6214aee7c0af8e2
author Chris Tate <ctate@android.com> 1457747718 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457747719 +0000

Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev