Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

LatinIME
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

481a75fc

Commit 481a75fc authored 14 years ago by satok

Downloads
- Plain Diff

Merge remote branch 'goog/master'

Conflicts:
	java/src/com/android/inputmethod/latin/LatinIME.java

parents cbd4592f 44f92495

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

java/src/com/android/inputmethod/latin/CandidateView.java 12 additions, 1 deletion

java/src/com/android/inputmethod/latin/CandidateView.java
java/src/com/android/inputmethod/latin/LatinIME.java 27 additions, 8 deletions

java/src/com/android/inputmethod/latin/LatinIME.java
native/Android.mk 7 additions, 2 deletions

native/Android.mk

with 46 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment