Fix build error
Fix spacing error
Changing default values and strings isn't helping unless it's approved by Google.

Change bluetooth timeout value wording

Use vanirs performance settings 1

Revert "Use vanirs performance settings 1"

This reverts commit 322ade37c155ac6395454fab35c91870ed326083.

Someone forgot to put text at the end of line 2740

lol :)

Version related stuff

Grammar fixes, string changes, better explanations, and fill missing strings

Add 15 second increasing ring interval option

Remove .5 second ring interval option

on --> ON

Increase MAX_SERVICES in RunningState.java

Reduce CONTENTS_UPDATE_DELAY in RunningState.java

Fix build error

Fix spacing error
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_Settings into jellybean
Revert "Changing default values and strings isn't helping unless it's approved by Google."

This reverts commit 258e59c755dc674073115db06917ed42a1e53703.
Settings: MediaScanner behavior on boot (3/3)

Lets you enable/disable/ask (with a notification) media scanning on boot.
Can speed up boot and reduce initial boot lag from MediaScanner

Change-Id: I266f0adc1aaf2b28a7735d5b9cc965e699f06a6c
Fix build errors
Merge remote-tracking branch 'upstream/jellybean' into fix