Merge branch 'tizen' into devel/tizen_3.0 91/53791/1
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 9 Dec 2015 10:14:08 +0000 (19:14 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 9 Dec 2015 10:14:08 +0000 (19:14 +0900)
Change-Id: I16e48d006b3b346f03fb6159757c193733272dc3
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge