From: Lucas Dupin <dupin@google.com>
Date: Wed, 16 May 2018 21:07:08 +0000 (-0700)
Subject: Merge "Fix KeyguardUpdateMonitor test" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dbe6d50990;p=android-x86%2Fframeworks-base.git

Merge "Fix KeyguardUpdateMonitor test" into pi-dev
am: 8f4bed7de7

Change-Id: Idab6e96c851260854a6b240cc8b163b08e7e1c68
---

dbe6d50990ec7e85f64b8db0d96db08205eeebb7