OSDN Git Service

Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088...
authorJim Miller <jaggies@google.com>
Wed, 17 Aug 2016 23:33:13 +0000 (23:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:33:13 +0000 (23:33 +0000)
am: 669a153531

Change-Id: Ia8a9962fdbf010066b6fd72ed4ccdc35548571f9


Trivial merge