Merge "[context][ACR-272] Updated context trigger event/condition enumerations" into...
authorDonghyun Lee <dh0922.lee@samsung.com>
Tue, 16 Jun 2015 05:01:14 +0000 (14:01 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Tue, 16 Jun 2015 05:01:14 +0000 (14:01 +0900)

Trivial merge