tree 5c05b273d69f975749fc33087f9e7a1119a6439a
parent 1db19c2bf3dd52236a63bc602172f323890a629b
parent f92ea9c4efd5aac26dea71449311d04da9cdbbd4
author Paul Crowley <paulcrowley@google.com> 1533795049 -0700
committer android-build-merger <android-build-merger@google.com> 1533795049 -0700

Merge "Switch pattern/PIN constants to match values in cryptfs.h" am: 92f5db4a06 am: 6d418929f0 am: a2c5a6b3c2
am: f92ea9c4ef

Change-Id: I5ce921cb9c1ca0f27424ceb84e49793bb2c81d5d