From: Suprabh Shukla <suprabh@google.com>
Date: Fri, 5 May 2017 20:56:10 +0000 (+0000)
Subject: Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
X-Git-Tag: android-x86-9.0-r1~852^2~154
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3cadb80e8d;p=android-x86%2Fpackages-apps-Settings.git

Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
---

3cadb80e8d1a2a8ba4fadaaf62da00b77ce0ad22