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

d8380fdb

Commit d8380fdb authored 10 years ago by Ken Wakasa Committed by Android (Google) Code Review 10 years ago

Downloads
- Plain Diff

Merge "resolved conflicts for merge of 8159336b to master"

parents 8a413a2a 6da1c674

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/LatinIME.java 4 additions, 11 deletions

java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/RichInputConnection.java 31 additions, 0 deletions

...rc/com/android/inputmethod/latin/RichInputConnection.java
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java 18 additions, 3 deletions

.../com/android/inputmethod/latin/inputlogic/InputLogic.java

with 53 additions and 14 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