e75e4463cd
Conflicts: java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d |
||
---|---|---|
dictionaries | ||
java | ||
native | ||
tests | ||
tools | ||
Android.mk | ||
CleanSpec.mk |
e75e4463cd
Conflicts: java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d |
||
---|---|---|
dictionaries | ||
java | ||
native | ||
tests | ||
tools | ||
Android.mk | ||
CleanSpec.mk |