merge for sync with tizen_3.0 branch 77/110077/1 accepted/tizen/common/20170113.183815 accepted/tizen/ivi/20170113.224359 accepted/tizen/mobile/20170113.224324 accepted/tizen/unified/20170309.033255 accepted/tizen/wearable/20170113.224337 submit/tizen/20170113.034613 submit/tizen_unified/20170308.100408
authorintae, jeon <intae.jeon@samsung.com>
Fri, 13 Jan 2017 01:00:51 +0000 (10:00 +0900)
committerintae, jeon <intae.jeon@samsung.com>
Fri, 13 Jan 2017 01:00:51 +0000 (10:00 +0900)
Change-Id: I36ceee3599c02042fe9ccc68e2de5ff6facb6364
Signed-off-by: intae, jeon <intae.jeon@samsung.com>

Trivial merge