resolved conflicts for merge of 1ac20c8a to klp-dev-plus-aosp
[android/platform/packages/apps/Phone.git] /