Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev

This commit is contained in:
Amin Shaikh
2016-09-14 18:52:53 +00:00
committed by Android (Google) Code Review