From: Amin Shaikh <ashaikh@google.com>
Date: Wed, 14 Sep 2016 19:11:27 +0000 (+0000)
Subject: Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~199
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=438167c61dfe7be37361521f9c9308d92875fc25;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
am: 1c0601b046

Change-Id: I307d81f183ebfcc9bb1308382d8fbf357a0e6479
---

438167c61dfe7be37361521f9c9308d92875fc25