tree 7394a1e5929eeb0b2f48605fc44bb4ed4bd93175
parent 973fbb1591b94c83fe1d62593c3e26eaf82741f3
parent 31f90b62e8c83270094f5b0b4c75a0e06d72cd75
author Jim Miller <jaggies@google.com> 1264029124 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1264029124 -0800

Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen."