Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Dialer into cm-12.1

Change-Id: I594cec327dc6b576d765ba497fca0db6f91aa3ba
tree: da894efce8014842cb162053f81b508c4634d9fc
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags