summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2014-11-08 13:58:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-08 13:58:42 +0000
commit74d7841f248103e4b116708b7201cc7fd0b74f6e (patch)
treee9f23e66d19a57db4d014f5a7c09dd86fafae9e2 /res
parent6bd45c0eba9058362a44135ca365b3d4b685be9d (diff)
parent2e6a170aa579a05b120d5b8c6d56250bbed54674 (diff)
downloadpackages_apps_Settings-74d7841f248103e4b116708b7201cc7fd0b74f6e.zip
packages_apps_Settings-74d7841f248103e4b116708b7201cc7fd0b74f6e.tar.gz
packages_apps_Settings-74d7841f248103e4b116708b7201cc7fd0b74f6e.tar.bz2
am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f
automerge: 2e6a170 * commit '2e6a170aa579a05b120d5b8c6d56250bbed54674': Prevent factory reset for short passwords in CryptKeeper
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions