diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-15 21:02:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-15 21:02:09 +0000 |
| commit | 1d050220a0564b02bc1f4c33c5984a684a47bfa5 (patch) | |
| tree | e98f89146de3faab446e320b0e096aeba1b537ad /res/values-fi | |
| parent | 5e91648077f8f0765aa8628d0e99accfe2f87383 (diff) | |
| parent | 3ef52587da6fd91fc12164fd57100d6e352508ec (diff) | |
| download | packages_apps_Settings-1d050220a0564b02bc1f4c33c5984a684a47bfa5.zip packages_apps_Settings-1d050220a0564b02bc1f4c33c5984a684a47bfa5.tar.gz packages_apps_Settings-1d050220a0564b02bc1f4c33c5984a684a47bfa5.tar.bz2 | |
am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
Add a checkbox option to 'require password to decrypt'
Diffstat (limited to 'res/values-fi')
0 files changed, 0 insertions, 0 deletions