| commit | ce477dbd8305fbe4f615f760556f9f42293ef27a | [log] [tgz] |
|---|---|---|
| author | Claudia de Veaux <deveaux@google.com> | Tue Aug 09 11:07:13 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 09 11:07:13 2011 -0700 |
| tree | 2fc27b8011b65d12f71722c7adcdf30b94e227ef | |
| parent | 1685ac22b692df78a2cc48ad11e82d159c502b71 [diff] | |
| parent | 74f9aba764aa40776353d34fc8d81eb2877fb8c8 [diff] |
Merge "Fix for 5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter."