Merge ppull request #258 from asmorkalov/android_emu_fix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 15:25:57 +0000 (19:25 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 15:25:57 +0000 (19:25 +0400)

Trivial merge