Merge branch 'master' into tizen accepted/tizen/ivi/20160218.022807 accepted/tizen/mobile/20160202.115338 accepted/tizen/tv/20160202.115347 accepted/tizen/wearable/20160202.115409 submit/tizen/20160202.080640 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000001
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:45:30 +0000 (16:45 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:45:30 +0000 (16:45 +0900)
commitc800abf1a54149f8042a6b7f37a9b21b1ac5d618
tree0aa7c9e9e4e32d9e2327e3b91cc0b5fbbb9bac38
parent2314154818d137e04a4d4e5a2f834ca6b39f35ec
parent5e2aa294e0867669af0d3ec590a9fad710228d95
Merge branch 'master' into tizen