Feat: Allow users to disable safe headset volume warning (2/2)

Change-Id: I6211b7698ab299c3d77a6a57fb41c296865dce7a
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Stats: fix regex for jb-mr1 builds

Change-Id: Iff8175b4e229bbe0a7746a00f66d4484340e6064
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/aokpstats/Utilities.java