Dan Sandler 8d365fe440 am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev ...

* commit 'd1b160f362e4d2bd961d8091b438f8eeb7d61a2f':
  "I tried to think of the most harmless thing."

2015-08-16 03:02:19 +00:00

..

java

am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 03:02:19 +00:00

jni

am 0d2e3d3e: am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

2015-08-12 11:02:48 +00:00

res

am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

2015-08-16 03:02:19 +00:00

tests

Move parseInputMethodsAndSubtypesString to InputMethodUtils.

2015-08-14 21:03:15 +00:00