tree bd88d9e9f90e7154b468037431cde94a31fd19c5
parent 1a70ce6220c922da7c39714223003e87442e1fd5
parent b02cbdeeb3cb4d7989d93649daac01d4ebb89fd6
author Lucas Dupin <dupin@google.com> 1499780035 +0000
committer android-build-merger <android-build-merger@google.com> 1499780035 +0000

Merge "Lock pattern should be red when error" into oc-dr1-dev
am: b02cbdeeb3

Change-Id: Iaf3f580af7b8e3bc7a4bfb7a9d5344bb37ab4dc6