Merge branch 'tizen' into tizen_3.0 23/98723/1 submit/tizen_3.0/20161122.012747
authorGeunsun, Lee <gs86.lee@samsung.com>
Fri, 18 Nov 2016 10:51:09 +0000 (19:51 +0900)
committerGeunsun, Lee <gs86.lee@samsung.com>
Fri, 18 Nov 2016 10:51:30 +0000 (19:51 +0900)
Change-Id: Id338c6572cb9ec2b86951f98ef1f034baf6ef193


Trivial merge