tree 92b313a223082dbd6da54619db640b43204cc99a
parent b69d9324347e3742904c4828e7f73e875aeffcac
parent 3e5d3fd7e172ee85a7bb67baa01acbc3549dfdb6
author Jim Miller <jaggies@google.com> 1315014893 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315014893 -0700

Merge "Fix 5185505: Update DevicePolicyManager to support weak biometric security."