summaryrefslogtreecommitdiffstats
path: root/nfc-extras
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-09-04 15:20:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-04 15:20:42 -0700
commit175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3 (patch)
tree5892f9df667e5fed3fc3f18be7fb075869883632 /nfc-extras
parent690420831c9b60f7fb2f1100aeef67ad79bfd3bb (diff)
parentb8ec470617590fa2025db869e8e80dcce8eaec23 (diff)
downloadframeworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.zip
frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.gz
frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.bz2
Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions