| commit | 817ae6393a0ea7b42c5a4a6255ae5c4e7464a5a0 | [log] [tgz] |
|---|---|---|
| author | Claudia de Veaux <deveaux@google.com> | Mon Aug 08 14:15:28 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 08 14:15:29 2011 -0700 |
| tree | 2a82da6ba5145f669d282a32b5c5f1b13a4df2d5 | |
| parent | bbd891d1f04d19522ce3c1a7982ea98dfdaee967 [diff] | |
| parent | b6ba1f92f00f1470f7eb97a5809158216000188d [diff] |
Merge "Fix for 5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug."