merge with release

Mihail Slavchev · Mihail Slavchev · commit 39a266ebea42 · 2016-06-27T18:00:13.000+03:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "files": [
     "**/*"
   ]
diff --git a/test-app/app/src/main/assets/app/mainpage.js b/test-app/app/src/main/assets/app/mainpage.js
@@ -1,4 +1,4 @@
-__disableVerboseLogging();
+//__disableVerboseLogging();
 __log("starting tests");
 
 // methods that common tests need to run

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tns-android",`
`3`	`3`	`"description": "NativeScript Runtime for Android",`
`4`		`- "version": "2.1.0",`
	`4`	`+ "version": "2.1.1",`
`5`	`5`	`"files": [`
`6`	`6`	`"*/"`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__disableVerboseLogging();`
	`1`	`+//__disableVerboseLogging();`
`2`	`2`	`__log("starting tests");`
`3`	`3`
`4`	`4`	`// methods that common tests need to run`