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)
commit3cadb80e8d1a2a8ba4fadaaf62da00b77ce0ad22
treeee00b7606968c4b870a9f6cb55ecdfaad8ed1c28
parent83e2511d455c007511d8438dae99b799a1e7d91a
parent43083b43321196814305f4d4c23d4b4eb78fdc48
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c