Merge "Update STMS" into tizen
authorjunkyu han <junkyu.han@samsung.com>
Mon, 5 Sep 2016 05:58:24 +0000 (22:58 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 5 Sep 2016 05:58:24 +0000 (22:58 -0700)

Trivial merge