tree cd8af6e14eeed2947b1a8f56d5b673a64758b11b
parent 3b1ae5e40b9bcdec8ecf1cdeb01fd9f834825a58
parent 511e0d8323d2d2ed341ba40b15bc646e134ac03b
author justinzhang <justinzhang@google.com> 1399581312 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1399581312 +0000

Merge "DevicePolicyManager Authentication for Lock Task"