summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SecuritySettings.java
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-07-21 00:38:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-21 00:38:39 +0000
commitd85fafce30f6fb71ea9de9de3c6d8aafc99dba33 (patch)
treee1edbd33b321317ffeca9459aad97a74bdc9acc0 /src/com/android/settings/SecuritySettings.java
parentd10026cbfde671448b702fde345da52ac7569d04 (diff)
parent15546c0b9ddde0bb76636a02a70c225015e3db97 (diff)
downloadpackages_apps_Settings-d85fafce30f6fb71ea9de9de3c6d8aafc99dba33.zip
packages_apps_Settings-d85fafce30f6fb71ea9de9de3c6d8aafc99dba33.tar.gz
packages_apps_Settings-d85fafce30f6fb71ea9de9de3c6d8aafc99dba33.tar.bz2
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
0 files changed, 0 insertions, 0 deletions