OSDN Git Service

Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef
authorAndrew Zeng <zenga@google.com>
Thu, 16 Mar 2017 23:40:09 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Mar 2017 23:40:09 +0000 (23:40 +0000)
am: a01e2212c8

Change-Id: Id333403e3a989e233a97760b716055b3abd186d6


Trivial merge