From: Andrew Scull <ascull@google.com>
Date: Sat, 14 Jan 2017 00:33:43 +0000 (+0000)
Subject: Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am... 
X-Git-Tag: android-x86-8.1-r1~5437
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=74ebc576b480a12e7203491643e05b9617754c8c;p=android-x86%2Fframeworks-base.git

Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: eadd29ffa6" into nyc-mr2-dev-plus-aosp
am: e688b70eb2

Change-Id: I48bfc9548432bdf41021d956617b1b37cc3c46ff
---

74ebc576b480a12e7203491643e05b9617754c8c