Geoff Mendal 7f29f2ed5a Merge "Import translations. DO NOT MERGE"

2014-12-10 20:41:31 +00:00

..

java

resolved conflicts for merge of 3bae94d7 to master

2014-12-10 11:03:40 -08:00

jni

Merge "drawBitmapMatrix is deprecated, code work-around"

2014-12-10 18:02:12 +00:00

res

Import translations. DO NOT MERGE

2014-12-10 11:35:51 -08:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00