Merge "[ITC][context][ACR-672][Added APIs for custom event/condition]" into tizen_3.0
authorJaeKyung Lee <jk79.lee@samsung.com>
Mon, 11 Jul 2016 10:17:24 +0000 (03:17 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 11 Jul 2016 10:17:24 +0000 (03:17 -0700)

Trivial merge