tree dadb5293e6e97753bc9d31739b03257115650bc9
parent 22dbe2919528656f5f2c94ab9db4f2099d5954fa
parent 6172b7bbe2ee47b5d1e3b9dc1189bf69fede28ff
author Abhisek Devkota <ciwrl@cyanogenmod.com> 1398455344 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> 1398455344 +0000

Merge "move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider" into cm-11.0