Merge "disable mediacontoller, context mgr - to prevent build error for a while"...
authorHyunjin Park <hj.na.park@samsung.com>
Thu, 4 Jun 2015 02:27:50 +0000 (11:27 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Thu, 4 Jun 2015 02:27:51 +0000 (11:27 +0900)

Trivial merge