tree 0f81427d27c1d8d6239632cc140f946e0e6a7181
parent d2c47843591f196420211722f7c2e3bcd8ace2ee
parent 96eb5b724bab31125e15eef2c926f6648567c3a1
author TreeHugger Robot <treehugger-gerrit@google.com> 1486976772 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486976776 +0000

Merge changes I8a2c5ffb,I2750695d

* changes:
  Fix live wallpaper not showing on lock screen after restore
  Workaround wallpaper restore race