Merge branch 'tizen' into mw 14/27714/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 18 Sep 2014 04:42:11 +0000 (13:42 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 18 Sep 2014 04:42:41 +0000 (13:42 +0900)
Change-Id: I47787ef3c460ed5d90b7632190724e94ef33f168
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

Trivial merge