From: Miao Miao (苗苗) Date: Tue, 2 May 2017 17:46:41 +0000 (+0000) Subject: Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b X-Git-Tag: android-x86-9.0-r1~852^2~2^2~10 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b1480c8cab;p=android-x86%2Fpackages-apps-Settings.git Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2 Change-Id: If6ad081e117a94df84d041776649af63c392cc30 --- b1480c8cab8965c37186b22ceeb7cb3f4296a8d9