Merge branch 'master' into tizen
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 08:40:27 +0000 (17:40 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 08:40:27 +0000 (17:40 +0900)
commit2314154818d137e04a4d4e5a2f834ca6b39f35ec
treeea167635572ae671dd8597b2fcb80cfa35121590
parente872770a4c5ce19b42bf971aec58a7bba17eea0a
parent5985b527eec469e4e24b3d67ff35ca1b23c2edd7
Merge branch 'master' into tizen