OSDN Git Service

Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
authorRicky Wai <rickywai@google.com>
Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)
am: 43f6a45e7e

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60


Trivial merge