OSDN Git Service

Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am: 43083b4332
authorSuprabh Shukla <suprabh@google.com>
Fri, 5 May 2017 21:02:10 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 21:02:10 +0000 (21:02 +0000)
commit3dea2a9654442ff73514d5d211a4f00c14d693ec
treeff3cd1b44747e11285808b313882f3fba2701452
parent4ae7816fb6b14916ba239952bf9af27a277fa8c1
parent3cadb80e8d1a2a8ba4fadaaf62da00b77ce0ad22
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am: 43083b4332
am: 3cadb80e8d

Change-Id: I6503c03ce91af9c3059135160abcdebe8d6fd6b8
res/values/strings.xml