thought i pushed this. ...

...

 Changes to be committed:
	modified:   res/values/strings.xml

Change-Id: If2bea0ab610d61d67c70f6f0c0e77d0badd08b0c
Merge branch 'stock' of https://github.com/pax10/android_packages_apps_Phone into stock

Conflicts:
	res/values/strings.xml

 Changes to be committed:

Change-Id: Ibccae090e1931e891f045c64cd5c40d19375de3d