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

41a2c10e

Commit 41a2c10e authored 12 years ago by Ken Wakasa

Downloads
- Plain Diff

resolved conflicts for merge of 4ad92578 to master

Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef

parents ea23a285 4ad92578

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

java/src/com/android/inputmethod/latin/InputAttributes.java 0 additions, 5 deletions

java/src/com/android/inputmethod/latin/InputAttributes.java
java/src/com/android/inputmethod/latin/InputTypeUtils.java 9 additions, 19 deletions

java/src/com/android/inputmethod/latin/InputTypeUtils.java
java/src/com/android/inputmethod/latin/LatinIME.java 1 addition, 3 deletions

java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/SettingsValues.java 0 additions, 4 deletions

java/src/com/android/inputmethod/latin/SettingsValues.java

with 10 additions and 31 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