Baligh Uddin 449616f9ae Merge "Import translations. DO NOT MERGE"

2014-03-25 18:56:32 +00:00

..

java

Merge "resolved conflicts for merge of 74fb97de to master"

2014-03-25 18:32:23 +00:00

jni

Merge "Move where updateProperties is called"

2014-03-25 17:46:18 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-03-25 18:56:32 +00:00

tests

Add one test application for multidex.

2014-03-24 11:28:31 +01:00