Sailesh Nepal 00ffde305d resolved conflicts for merge of 2d72d000 to master-nova ...

Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d

2014-03-25 13:02:59 -07:00

..

java

resolved conflicts for merge of 2d72d000 to master-nova

2014-03-25 13:02:59 -07:00

jni

Merge "Move where updateProperties is called"

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

res

am 41c2d2ce: Merge "resolved conflicts for merge of 6c45157c to master"

2014-03-24 15:38:02 -07:00

tests

Add one test application for multidex.

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