OSDN Git Service

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

Change-Id: I17880622c489df79eeea5116b3afe3c462b06554