Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Fix Spelling Mistake in Strings

Change-Id: I6df02651d9d231ac3bda606b57090cb3f419cf83
Merge remote-tracking branch 'github_ErikCas/jb-mr1' into jb-mr1
Merge remote-tracking branch 'github_AOKP/jb-mr1' into jb-mr1
AudioService: Restore volumes after boot and when a headset is plugged