resolved conflicts for merge of aca5785a to master

java/res/xml/key_styles_currency.xml

java/res/xml/key_styles_currency_generic.xml

java/res/xml/method.xml

java/res/xml/rowkeys_tamil1.xml

java/res/xml/rowkeys_tamil2.xml

java/res/xml/rowkeys_tamil3.xml

java/src/com/android/inputmethod/keyboard/Key.java

...oid/inputmethod/keyboard/internal/KeyboardTextsTable.java

...tmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java

.../src/com/android/inputmethod/keyboard/layout/Sinhala.java

tests/src/com/android/inputmethod/keyboard/layout/Tamil.java

...droid/inputmethod/keyboard/layout/tests/TestsTamilIN.java

...droid/inputmethod/keyboard/layout/tests/TestsTamilLK.java

...droid/inputmethod/keyboard/layout/tests/TestsTamilSG.java

...board-text/res/values-bn-rIN/donottranslate-more-keys.xml

...board-text/res/values-si-rLK/donottranslate-more-keys.xml

...board-text/res/values-ta-rLK/donottranslate-more-keys.xml

...board-text/res/values-ta-rSG/donottranslate-more-keys.xml

...ake-keyboard-text/res/values/donottranslate-more-keys.xml