Ken Wakasa
|
2fa3693c26
|
Reset to 9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master.
Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
|
2013-12-13 17:13:32 +09:00 |
|
Satoshi Kataoka
|
9c739939a3
|
Add missing res dir
Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
|
2012-11-06 13:49:17 +09:00 |
|
Satoshi Kataoka
|
555e15a96a
|
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
|
2012-11-06 12:49:53 +09:00 |
|
Tadashi G. Takaoka
|
29e7b7ed6e
|
Implement popup suggestions pane
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
|
2011-08-31 21:21:22 +09:00 |
|