Fergus Henderson 6c641d3c67 am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev ...

* commit '3cf3a0b30cd3d3be806eeb04861731d7ed6e6f23':
  Fix for TTS.setLanguage throwing MissingResourceException

2013-05-08 10:47:56 -07:00

..

java

am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev

2013-05-08 10:47:56 -07:00

jni

Register EGLExt JNI methods

2013-05-06 11:36:59 -07:00

res

Import translations. DO NOT MERGE

2013-05-08 08:21:20 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00