tree e032fc2c9494ef0c0f0a50473837e1e7b3677918
parent a8d3e73f0df8dcc0f82b88f51f579f8e5f67ae78
parent 3422c197a82c6572fd2524bc636246ccb6b8a24a
author Christopher Tate <ctate@google.com> 1457748044 +0000
committer android-build-merger <android-build-merger@google.com> 1457748044 +0000

Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev am: fcbe17e1e0
am: 3422c197a8

* commit '3422c197a82c6572fd2524bc636246ccb6b8a24a':
  Once restored, the wallpaper needs to actually draw