| commit | a0111698d4920b964eb61f03e3d764c2eb6f6245 | [log] [tgz] |
|---|---|---|
| author | justinzhang <justinzhang@google.com> | Thu May 08 20:38:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 20:38:45 2014 +0000 |
| tree | 2b12c852727f9c507af51c54a11cde9bdd83b893 | |
| parent | 80f64f2555f176a62e04ed00a0341168d9109611 [diff] | |
| parent | ed32c842c6d0cc31587256bfbfc2693588ee556c [diff] |
am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task" * commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc': DevicePolicyManager Authentication for Lock Task