Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am: 1c0601b046
am: 438167c61d
Change-Id: Ibcd25fa3e77f870e32eefc291e3ddb6ea698d459
This commit is contained in:
1c0601b046
am: 438167c61d
Change-Id: Ibcd25fa3e77f870e32eefc291e3ddb6ea698d459