From: Peter Qiu <zqiu@google.com>
Date: Fri, 23 Jun 2017 18:31:08 +0000 (+0000)
Subject: Merge changes from topic 'wrong_password' into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~1030^2~717
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=401bc8164332c0bacde029c05e1cc517d6edf0b7;p=android-x86%2Fframeworks-base.git

Merge changes from topic 'wrong_password' into oc-dr1-dev
am: 702d4d56fe

Change-Id: I827bed9cd0c57abb33c91af05a089f8f2f5d59fb
---

401bc8164332c0bacde029c05e1cc517d6edf0b7