Merge remote-tracking branch 'origin/tizen' into release_z3
authorcskim <charles0.kim@samsung.com>
Wed, 16 Mar 2016 06:44:17 +0000 (15:44 +0900)
committercskim <charles0.kim@samsung.com>
Wed, 16 Mar 2016 06:44:17 +0000 (15:44 +0900)

Trivial merge