justinzhang a0111698d4 am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"
* commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc':
  DevicePolicyManager Authentication for Lock Task
2014-05-08 20:38:45 +00:00
..