am 76bd6bec: am fc363380: Merge "Introduce new "vibrate when ringing"" into jb-dev

* commit '76bd6bec98487c393a4dd632e2bb65044fb8fef9':
  Introduce new "vibrate when ringing"
This commit is contained in:
Daisuke Miyakawa
2012-05-09 10:20:13 -07:00
committed by Android Git Automerger
3 changed files with 22 additions and 3 deletions

View File

@@ -1591,6 +1591,9 @@
<string name="volume_notification_description">Notifications</string>
<!-- Volume description for alarm volume -->
<string name="volume_alarm_description">Alarms</string>
<!-- Sound settings screen, setting option name checkbox. About vibration setting
during incoming calls. [CHAR LIMIT=30] -->
<string name="vibrate_when_ringing_title">Vibrate when ringing</string>
<!-- Dock settings title, top level -->
<string name="dock_settings">Dock</string>