OSDN Git Service

Merge "NullPointerException when running monkey test in IccLockSettings"
authorxudiwen <xudiwen@xiaomi.com>
Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)
am: 2c8d826b01

Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015


Trivial merge