Merge "Fixed Control and Magnifier API" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 28 May 2015 16:27:00 +0000 (09:27 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 28 May 2015 16:27:00 +0000 (09:27 -0700)

Trivial merge