Qiwen Zhao ec3aad2e30 Merge commit 'd5c6745b' into klp-dev-plus-aosp ...

Conflicts:
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-fa/strings.xml
	res/values-iw/strings.xml

2014-02-14 16:04:37 -08:00

..

strings.xml

Merge commit 'd5c6745b' into klp-dev-plus-aosp

2014-02-14 16:04:37 -08:00