tree 50138d53324fb9114624b45376a1eb9a9f416557
parent bfceb41f5d75590cbccdcf43a8e99315a5a983aa
parent 5de3e5ab36e5cd21deaab68be2a662a15aaf0053
author Bryan Mawhinney <bryanmawhinney@google.com> 1487019251 +0000
committer android-build-merger <android-build-merger@google.com> 1487019251 +0000

Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
am: 5de3e5ab36

Change-Id: Icb15885a9ffb763dac1acf4db4685b3c8dcb5ac5