OSDN Git Service

Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
authorSuprabh Shukla <suprabh@google.com>
Fri, 26 May 2017 01:18:05 +0000 (01:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 01:18:05 +0000 (01:18 +0000)
am: 136a3da4a3

Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f


Trivial merge