am f06ab499: Merge "rename define" into jb-mr2-dev

* commit 'f06ab499999ead130660e5bc17324225503994ad':
  rename define
This commit is contained in:
Satoshi Kataoka 2013-03-01 10:39:02 +00:00 committed by Android Git Automerger
commit 61d2e10bd3

View file

@ -398,10 +398,10 @@ typedef enum {
EQUIVALENT_CHAR, EQUIVALENT_CHAR,
// It is a char located nearby on the keyboard // It is a char located nearby on the keyboard
NEAR_PROXIMITY_CHAR, NEAR_PROXIMITY_CHAR,
// It is an unrelated char // It is an unrelated char and could be a substitution char
UNRELATED_CHAR, UNRELATED_CHAR,
// It is an unrelated char and not a substitution // It is an unrelated char nor a substitution char
UNRELATED_AND_NOT_SUBSTITUTION_CHAR, UNRELATED_NOR_SUBSTITUTION_CHAR,
// Additional proximity char which can differ by language. // Additional proximity char which can differ by language.
ADDITIONAL_PROXIMITY_CHAR ADDITIONAL_PROXIMITY_CHAR
} ProximityType; } ProximityType;