This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.

This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2

Test: make

master is already up to date and

Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9

Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
585 files changed
tree: 7f98300ff2318f2eefb50d84ca2701a416590fb4
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE