Merge "[ITC][data-contorl][Non-ACR][Fix build fail]" into tizen_3.0
authorso2.park <so2.park@samsung.com>
Fri, 9 Sep 2016 02:55:14 +0000 (19:55 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 9 Sep 2016 02:55:14 +0000 (19:55 -0700)

Trivial merge