From: Charles He <qiurui@google.com>
Date: Mon, 18 Sep 2017 16:13:55 +0000 (+0000)
Subject: Merge "AM: refactor LockTask whitelist update logic."
X-Git-Tag: android-x86-9.0-r1~379^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=18d501ac172bc78867f6d9031560dfe5ab31b541;p=android-x86%2Fframeworks-base.git

Merge "AM: refactor LockTask whitelist update logic."
---

18d501ac172bc78867f6d9031560dfe5ab31b541