OSDN Git Service

Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into...
authorRicky Wai <rickywai@google.com>
Thu, 16 Jun 2016 10:47:53 +0000 (10:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:47:53 +0000 (10:47 +0000)
am: 95e27c77a4

Change-Id: I261cd65884f81d68a7c20e4653c3f5a5d336e032


Trivial merge