tree c08b7bf7ac0ab270680fc9dbda7dcb42865b051d
parent 4fa4b29890a85da661403ac85fad56d21acc093f
parent e3457fc127593ed13040cf246bdfbc3c3bfdecfe
author Jim Miller <jaggies@google.com> 1471476417 +0000
committer android-build-merger <android-build-merger@google.com> 1471476417 +0000

Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e am: cb83f6188b
am: e3457fc127

Change-Id: I1bc40c141498e62cad36acc9568177cb88debc11