Merge branch 'tizen_3.0' into tizen 13/109013/1
authorSeungbae Shin <seungbae.shin@samsung.com>
Fri, 6 Jan 2017 12:22:17 +0000 (21:22 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Fri, 6 Jan 2017 12:22:17 +0000 (21:22 +0900)
Change-Id: I868e7202a62ba5c56513a8d5774723b470efc966


Trivial merge