Merge (-sours) commit 'd766f81435e9d2ed2597bb024220f1f56ea74399' into oxygen_4.3

* commit 'd766f81435e9d2ed2597bb024220f1f56ea74399':
  Make vCard importer use DEFAULT_IMPORT_CHARSET.
Merge commit '7e91428b4c39aa40ace1a627bf236634f5e2391f' into oxygen_4.3

* commit '7e91428b4c39aa40ace1a627bf236634f5e2391f':
  Use standard Android mechanisms (showDialog, onCreateDialog) for Dialog handling. Makes dialogs persistent after orientation change Bug:1362446

Conflicts:
	src/com/android/contacts/ui/EditContactActivity.java
Merge commit '94c70ac5e5c8c261e962ef96b4b7974e25927fd9' into oxygen_4.3

* commit '94c70ac5e5c8c261e962ef96b4b7974e25927fd9':
  Fix the comment formatting
Merge commit '501b7eac6f85c4100fbd1b00d7c7841fe6472e7c' into oxygen_4.3

* commit '501b7eac6f85c4100fbd1b00d7c7841fe6472e7c':
  Splitting off the Join Contact mode.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Merge (-sours) commit '39ee8b684998718cdaa65057e982ec3445cca6a7' into oxygen_4.3

* commit '39ee8b684998718cdaa65057e982ec3445cca6a7':
  Make vCard importer use new structure.
Merge commit 'df5e05fb93a6bd4b2299dceb7217cfc757b5054e' into oxygen_4.3

* commit 'df5e05fb93a6bd4b2299dceb7217cfc757b5054e':
  Add MODE_PICK_MULTIPLE_PHONES mode which can be launched by ACTION_GET_MULTIPLE_PHONES a. Adds PhoneNumbersAdapter to handle the phone numbers don't belong to any contacts. b. UserSelection is added to handle the initial selection and  the user's change. c. Supports the screen rotation.

Conflicts:
	src/com/android/contacts/ContactsListActivity.java
Merge commit '4cd94419d615e5513849516dfcbf0ce4cd08ecd0' into oxygen_4.3

* commit '4cd94419d615e5513849516dfcbf0ce4cd08ecd0':
  Break up view-contact-activity into smaller pieces so that they can be better recombined. Also first import of temporary mvc-framework classes that should later go into the framework. Bug:2579760
Merge commit '26cda1a38eb348cf4e7d17a711d420207c66d45d' into oxygen_4.3

* commit '26cda1a38eb348cf4e7d17a711d420207c66d45d':
  Breaking out handling of empty message in Contacts
Merge commit 'cbcc44983dc84f25d43e45f25021019233a4e2ef' into oxygen_4.3

* commit 'cbcc44983dc84f25d43e45f25021019233a4e2ef':
  Update to new MVC framework
Merge commit 'c3a00085193e474c69ff0f455dd5d6086ff72e69' into oxygen_4.3

* commit 'c3a00085193e474c69ff0f455dd5d6086ff72e69':
  Some refactorings to MVC
Merge commit '1316b13d41e0ca252236df5692a69020a471cd4e' into oxygen_4.3

* commit '1316b13d41e0ca252236df5692a69020a471cd4e':
  Write tests for ContactLoader. Re-added support for legacy style (donut) ContactUris
Merge commit '27f1bc8b5687dbfd6542026293d68950d4555eca' into oxygen_4.3

* commit '27f1bc8b5687dbfd6542026293d68950d4555eca':
  Beginnings of a unit test for ContactsListActivity.
Merge commit 'f21bf27c13dacec9b4ed74cba9046a64948e97fb' into oxygen_4.3

* commit 'f21bf27c13dacec9b4ed74cba9046a64948e97fb':
  Refactor vCard importer so that it uses Service during the actual import.

Conflicts:
	res/values/strings.xml
	src/com/android/contacts/ImportVCardActivity.java
Merge commit '13e242b1e9a462acffc3c079326cc31dbc8ee5ab' into oxygen_4.3

* commit '13e242b1e9a462acffc3c079326cc31dbc8ee5ab':
  Make ImportVCardService use new structure.
Merge commit '89dada883a7f499122ffd782149c6b49a6b27d74' into oxygen_4.3

* commit '89dada883a7f499122ffd782149c6b49a6b27d74':
  Make vCard importer use new structure.
Merge commit '74a2dc5dd353aa724f3b4bcfc4694f15c4d0ff73' into HEAD

* commit '74a2dc5dd353aa724f3b4bcfc4694f15c4d0ff73':
  Speedup query by using a more narrow View. Change the Loader tests to use a Mock-ContentProvider to not change any real data
Merge commit 'd3e0cdb35e398249cfbe9ccf6dde589ca7face88' into HEAD

* commit 'd3e0cdb35e398249cfbe9ccf6dde589ca7face88':
  Integrate ContactHeaderWidget loading into ContactLoader to save queries. Remove old Activity.

Conflicts:
	src/com/android/contacts/ViewContactActivity.java
Merge commit '31ec0b51ac4d508f8727608b98d0bf916f2b20b9' into HEAD

* commit '31ec0b51ac4d508f8727608b98d0bf916f2b20b9':
  AllIntents - a test application for contact list.
Merge commit 'c2687c3c38d8fb5f34ad6d8fb5c33e16f335183c' into HEAD

* commit 'c2687c3c38d8fb5f34ad6d8fb5c33e16f335183c':
  Refactor to coupler/presenter pattern. Moved framework classes to correct packages
Merge commit '292ffd83a7c72baece51710d4daa57a474640c94' into HEAD

* commit '292ffd83a7c72baece51710d4daa57a474640c94':
  Make vCard exporter use getVCardTypeFromString().

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