tree 016a5f8ffb9f3359c901926883055381df94e02b
parent 13edf0a70beaa2f59377c633d0e11c70abcb66f3
parent 485fbda04c7651413122422121fc96e4227a5f77
author Jim Miller <jaggies@google.com> 1471475266 +0000
committer android-build-merger <android-build-merger@google.com> 1471475266 +0000

Fix vulnerability in LockSettings service am: 2d71384a13
am: 485fbda04c

Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c