am ceb1ff2a: Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev

* commit 'ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf':
  Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
This commit is contained in:
Philip Milne
2012-06-06 17:36:51 -07:00
committed by Android Git Automerger

View File

@@ -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>