merge in KQS81M
[android/platform/packages/apps/Phone.git] /