tree 6a0049f9fc9eca301d95996deb06b8affff5ebc6
parent cfa59b7d88a39169ada712e708cee68c3939548c
parent fcbe17e1e0a0a487ff5f41a32ff6bb7d056e5a76
author Christopher Tate <ctate@google.com> 1457747928 +0000
committer android-build-merger <android-build-merger@google.com> 1457747928 +0000

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

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