From: Benjamin Franz <bfranz@google.com>
Date: Thu, 29 Mar 2018 09:02:17 +0000 (+0000)
Subject: Merge "Update to lock task features API" into pi-dev
X-Git-Tag: android-x86-9.0-r1~155^2~171
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a5dabbb10861a5cea627936c56693550345b9a8;p=android-x86%2Fframeworks-base.git

Merge "Update to lock task features API" into pi-dev
---

3a5dabbb10861a5cea627936c56693550345b9a8