Merge "Make Contacts app use static library of vCard."
Cleaned up dialButtonPressed.

Made the hard button match the behaviour of the soft button.

In dialButtonPressed:
Moved the comment in the method commen.
Added couple of comments.

Removed the sendflash local parameter, in the case the dial string
is empty we never finish.

Intents are created in block they are used (flash and regular dial)
Added helpers to biuld regular/VM/flash intents.

tested:
On passion:
Last dialed number works even in an add call scenario.
Regular dial works.

On sholes:
Regular dial works.
Last dialed number works when not in call.
Flash is sent when trying to add a call.

Change-Id: I736b108aef90b87f043e68604ffb9b1adbc03f96
Modify ImportVCardService so that it does not rely on a stale constructor.

We are not 100% sure whether this change is really correct though all tests are in green.

Related change: I16e487fa

Change-Id: I0a5aa1ea587c6b2d25ce90ba0a23bc14ea8a12f5
Merge commit 'e504f6dbb39c923cf361b6f53c8c47d40e7ebd15' into HEAD

* commit 'e504f6dbb39c923cf361b6f53c8c47d40e7ebd15':
  Cleaned up dialButtonPressed.

Conflicts:
	src/com/android/contacts/TwelveKeyDialer.java
Merge commit 'd66b647fd85c488b90e15944c130788635ddedcd' into HEAD

* commit 'd66b647fd85c488b90e15944c130788635ddedcd':
  Modify ImportVCardService so that it does not rely on a stale constructor.
Revert "DO NOT MERGE Fix Activity instance leak by ContactsPreferences observer"

This reverts commit c7f25410daccf9e14c1726fd3e778910d894f243.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Revert "DO NOT MERGE Sticky tab rule: Remember the last tab that was used to call"

This reverts commit 00ea05799040a55f85cc449fede956983003af97.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
	src/com/android/contacts/DialtactsActivity.java
	src/com/android/contacts/PhoneDisambigDialog.java
	src/com/android/contacts/ViewContactActivity.java
Revert "Implement granting of URI permissions from picker.  DO NOT MERGE."

This reverts commit 958aca24fb348cd8795a952df7de299f09e66d2d.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java