Andrew Dolgov 2b6c8116b8 Merge branch 'master' into fsvideo-test		2014-11-25 12:33:09 +03:00
..
java	Merge branch 'master' into fsvideo-test	2014-11-25 12:33:09 +03:00
res	Merge branch 'master' into fsvideo-test	2014-11-25 12:33:09 +03:00
AndroidManifest.xml	add workaround for android issue #78154	2014-11-18 01:44:03 +03:00