Merge branch 'master' into develop 66/126566/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:31:18 +0000 (16:31 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:31:22 +0000 (16:31 +0900)
commitb469ee6a1b305a4c013f20766d433bd4d586ae16
tree9d55cd15c9cee61b9fd6c11caab5f148a1196c2b
parentfe4b2a3fff9a1f61177494a8ebc512d1d12f228a
parent27b370a1eee556fbf098f1c0421d70635acf9fad
Merge branch 'master' into develop

Change-Id: Ief27bf7e7dbdb5798e2d4043a119959750f5b3e6
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>