OSDN Git Service

[automerger skipped] Merge "FRP: save password quality in DPM.resetPassword" into...
authorAdrian Roos <roosa@google.com>
Thu, 13 Dec 2018 19:19:55 +0000 (11:19 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Dec 2018 19:19:55 +0000 (11:19 -0800)
am: 96a1ec5944  -s ours

Change-Id: Ib9b4bc6aed989783040c20b9c98e98c6cbda9688


Trivial merge