resolved conflicts for merge of 20088113 to master
[android/platform/packages/apps/Phone.git] /