John Reck bcad68ad80 Merge "Move where updateProperties is called"

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

..

java

Merge "Move where updateProperties is called"

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

jni

Merge "Move where updateProperties is called"

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

res

resolved conflicts for merge of 6c45157c to master

2014-03-24 15:33:25 -07:00

tests

Add one test application for multidex.

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