tree a69e340cbfdd0969d3b1498b9fcf5251860abbee
parent 059aedf808c8b9b3da1457eef52f3d477878d50b
parent 48b9b0d068844af9eb37c215484831c4d6b831b0
author Jim Miller <jaggies@google.com> 1348266093 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348266093 -0700

Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev