OSDN Git Service

Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
authorMiao Miao (苗苗) <miao.miao@spreadtrum.com>
Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 17:46:41 +0000 (17:46 +0000)
am: c6e3467cc2

Change-Id: If6ad081e117a94df84d041776649af63c392cc30


Trivial merge