am 9f267bdd: Import revised translations
Use the framework version of Loader and friends now that they exist.

Change-Id: I1c99aec7c60545a1b41b241e95447565c8bd4df4
Merge commit '3c46291ef057eaf7b7f8ca5971e59bebe734a660' into HEAD

* commit '3c46291ef057eaf7b7f8ca5971e59bebe734a660':
  Use the framework version of Loader and friends now that they exist.
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