diff options
| author | Philip Milne <pmilne@google.com> | 2012-06-06 17:39:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-06 17:39:25 -0700 |
| commit | 9b059a10c7e5e84ce6b7fae5da0d18fa44fe4264 (patch) | |
| tree | 597cf9890792c0d0d6895c4dd18024ab5fe3886c /res/values | |
| parent | 0c629dfbb567e15769647e627568b453011c7a71 (diff) | |
| parent | 0884f4030367eaad14cbd8114c88624286cb4cfe (diff) | |
| download | packages_apps_settings-9b059a10c7e5e84ce6b7fae5da0d18fa44fe4264.zip packages_apps_settings-9b059a10c7e5e84ce6b7fae5da0d18fa44fe4264.tar.gz packages_apps_settings-9b059a10c7e5e84ce6b7fae5da0d18fa44fe4264.tar.bz2 | |
am 0884f403: am ceb1ff2a: Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index dc2ff33..ffaf056 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3703,7 +3703,7 @@ <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] --> <string name="debug_layout">Show layout bounds</string> <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] --> - <string name="debug_layout_summary">Display information about bounds, padding, etc.</string> + <string name="debug_layout_summary">Show clip bounds, margins, etc.</string> <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] --> <string name="show_cpu_usage">Show CPU usage</string> |