diff options
| author |   satok <satok@google.com> | 2010-12-27 20:13:16 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-12-27 20:13:16 +0900 |
| commit | d12def6dc8ba3a2f47b90e6d5d442f315152c6d4 (patch) | |
| tree | 7274b29f518f94d31cd5c995d1b46bfc323de818 /java/src/com/android/inputmethod/latin/ContactsDictionary.java | |
| parent | b80f171623a11bceb99b563594162d0034b9bde8 (diff) | |
| parent | bfe2b534457d946645d483e311249787ba4fc3ae (diff) | |
| download | latinime-d12def6dc8ba3a2f47b90e6d5d442f315152c6d4.tar.gz latinime-d12def6dc8ba3a2f47b90e6d5d442f315152c6d4.tar.xz latinime-d12def6dc8ba3a2f47b90e6d5d442f315152c6d4.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/res/values-cs/strings.xml
java/res/values-da/strings.xml
java/res/values-de/strings.xml
java/res/values-el/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-es/strings.xml
java/res/values-fr/strings.xml
java/res/values-it/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt-rPT/strings.xml
java/res/values-pt/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-tr/strings.xml
java/res/values-xlarge/dimens.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/res/values/bools.xml
java/res/xml/kbd_qwerty_rows.xml
java/res/xml/method.xml
java/res/xml/prefs.xml
Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ContactsDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ContactsDictionary.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java index 95a3b5c7d..048f72dc5 100644 --- a/java/src/com/android/inputmethod/latin/ContactsDictionary.java +++ b/java/src/com/android/inputmethod/latin/ContactsDictionary.java @@ -21,6 +21,7 @@ import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; import android.os.SystemClock; +import android.provider.BaseColumns; import android.provider.ContactsContract.Contacts; import android.text.TextUtils; import android.util.Log; @@ -28,7 +29,7 @@ import android.util.Log; public class ContactsDictionary extends ExpandableDictionary { private static final String[] PROJECTION = { - Contacts._ID, + BaseColumns._ID, Contacts.DISPLAY_NAME, }; |