From: Fan Zhang <zhfan@google.com>
Date: Thu, 6 Oct 2016 20:49:12 +0000 (+0000)
Subject: Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~96
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=207bb2947ee002a2e27010e3713189098c6dea1c;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am: 6cea122bfc

Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e
---

207bb2947ee002a2e27010e3713189098c6dea1c