am 8adcca68: Import revised translations
am 22c9f67e: am 8adcca68: Import revised translations
Merge "Making primary search results appear before secondary"
Animating pinned headers

Change-Id: Ic5abe4d693ee7106ffc909069d69bb3ef46e57bc
Showing "searching..." in contact search

Change-Id: I41d2fbda1f66e293b08da3e72eb854089dc36509
Canceling running queries before starting new ones.

Change-Id: Icd7837cf44d7f33a6027961640205f23d0158a72
Merge commit 'f141cdf7d7bd3a8acb9bab373dc370da73273718' into HEAD

* commit 'f141cdf7d7bd3a8acb9bab373dc370da73273718':
  Canceling running queries before starting new ones.
  Showing "searching..." in contact search
  Animating pinned headers
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