Fix vulnerability in LockSettings service am: 2d71384a13

author Jim Miller <jaggies@google.com>

Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)
author Jim Miller <jaggies@google.com>
Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)
diff --cc core/java/com/android/internal/widget/LockPatternUtils.java
Simple merge
diff --cc services/core/java/com/android/server/LockSettingsService.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)
		1	2
core/java/com/android/internal/widget/LockPatternUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/LockSettingsService.java	patch \|	diff1 \|	diff2 \|	blob \| history