diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-11-06 12:49:53 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-11-06 12:49:53 +0900 |
| commit | 555e15a96a00e8829981557d96e9fa7fc5a74f8c (patch) | |
| tree | 9750c7af9777b63c176cc780c2a6de4849931434 /java/res/raw | |
| parent | 9381ab669f12664f7e2debea846d3ce71f89b256 (diff) | |
| parent | 5f2fa6b82cbb6714ab2996aebc16f10c62d0e673 (diff) | |
| download | latinime-555e15a96a00e8829981557d96e9fa7fc5a74f8c.tar.gz latinime-555e15a96a00e8829981557d96e9fa7fc5a74f8c.tar.xz latinime-555e15a96a00e8829981557d96e9fa7fc5a74f8c.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
java/res/values-ca/strings.xml
java/res/values-cs/strings.xml
java/res/values-de/strings.xml
java/res/values-es/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-it/strings.xml
java/res/values-lv/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-uk/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/src/com/android/inputmethod/latin/RichInputConnection.java
Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
Diffstat (limited to 'java/res/raw')
| -rw-r--r-- | java/res/raw/main.dict | bin | 34 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_de.dict | bin | 1605732 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_en.dict | bin | 1068791 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_es.dict | bin | 1138855 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_fr.dict | bin | 1327366 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_it.dict | bin | 1143310 -> 0 bytes |
| -rw-r--r-- | java/res/raw/main_pt_br.dict | bin | 1091964 -> 0 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/java/res/raw/main.dict b/java/res/raw/main.dict Binary files differdeleted file mode 100644 index a456cf3d3..000000000 --- a/java/res/raw/main.dict +++ /dev/null diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict Binary files differdeleted file mode 100644 index 6122cd3f0..000000000 --- a/java/res/raw/main_de.dict +++ /dev/null diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict Binary files differdeleted file mode 100644 index e02e300e4..000000000 --- a/java/res/raw/main_en.dict +++ /dev/null diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict Binary files differdeleted file mode 100644 index 71370aac2..000000000 --- a/java/res/raw/main_es.dict +++ /dev/null diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict Binary files differdeleted file mode 100644 index 8e616591c..000000000 --- a/java/res/raw/main_fr.dict +++ /dev/null diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict Binary files differdeleted file mode 100644 index 82579078c..000000000 --- a/java/res/raw/main_it.dict +++ /dev/null diff --git a/java/res/raw/main_pt_br.dict b/java/res/raw/main_pt_br.dict Binary files differdeleted file mode 100644 index d31752e07..000000000 --- a/java/res/raw/main_pt_br.dict +++ /dev/null |