Merge branch 'devel/master' into tizen 20/71020/1
authorminho.sun <minho.sun@samsung.com>
Wed, 18 May 2016 02:13:46 +0000 (11:13 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 18 May 2016 02:13:53 +0000 (11:13 +0900)
commit926ebd2d9905f0eb6f255b4a6e467ad8fca9e0f8
treeb7550671f16dc0f41ef8dbbb9b0636e66a15c313
parenta55bad0f6432f7261a03567c7ed7589c024c14f9
parent570ff503a34f8ae98651129d9b63ff15f5b62228
Merge branch 'devel/master' into tizen

Change-Id: I372470cef28715cbd5caeffe4434054c6454e34c