merge in klp-release (no-op)
[android/platform/packages/apps/Phone.git] /