Merge "[version] 1.69" into tizen_3.0.m2 accepted/tizen_3.0.m2_common accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable tizen_3.0.m2 accepted/tizen/3.0.m2/common/20170111.094201 accepted/tizen/3.0.m2/mobile/20170111.043327 accepted/tizen/3.0.m2/tv/20170111.043346 accepted/tizen/3.0.m2/wearable/20170111.043406 submit/tizen_3.0.m2/20170111.025036
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 11 Jan 2017 02:43:37 +0000 (18:43 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 11 Jan 2017 02:43:37 +0000 (18:43 -0800)

Trivial merge