ignore from open-source master

Change-Id: Ic5531553969e0eb1190f22d6db416499df178946
am 19581f0f: ignore from open-source master
Making primary search results appear before secondary

Change-Id: I36606fd699eb54214ac280c63c040bc021848b3b
Merge commit 'fcfbe6a92a8a34b4a6ca784de02287647b903bb2' into HEAD

* commit 'fcfbe6a92a8a34b4a6ca784de02287647b903bb2':
  Making primary search results appear before secondary

Conflicts:
	src/com/android/contacts/RecentCallsListActivity.java
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