Merge changes I72afd762,I213542ce into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 12 Mar 2014 08:06:01 +0000 (01:06 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 12 Mar 2014 08:06:01 +0000 (01:06 -0700)
* changes:
  Emulator : Enables host GL information to log file
  maru_camera : Fixed some problems


Trivial merge