OSDN Git Service

Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
authorSuprabh Shukla <suprabh@google.com>
Fri, 5 May 2017 20:56:10 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 20:56:10 +0000 (20:56 +0000)
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c


Trivial merge