am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

* commit 'd06ba151f5cc966bf05b2ac0146602d31ae81c4a':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
This commit is contained in:
Billy Lau
2015-07-21 17:54:01 +00:00
committed by Android Git Automerger
4 changed files with 30 additions and 27 deletions

View File

@@ -6868,7 +6868,7 @@
<string name="accessibility_lock_screen_progress"><xliff:g id="count" example="1">%1$d</xliff:g> of <xliff:g id="count" example="1">%2$d</xliff:g> characters used</string>
<!-- System Alert Window settings -->
<!-- Title of Draw Overlay preference item [CHAR LIMIT=45] -->
<!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
<string name="draw_overlay_title">Apps that can draw over other apps</string>
<!-- Title of draw overlay screen [CHAR LIMIT=30] -->
<string name="draw_overlay">Draw over other apps</string>