Merge branch 'devel/master' into tizen 80/133580/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:58:22 +0000 (10:58 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:58:31 +0000 (10:58 +0900)
commit3271f8d51def5bfba8c855fdc31df640124b9294
treee728973172eb29dbeb1359df7771511ed77b915a
parent2651968e985219abded28daba199ac79fe56bb31
parent213ca111a6387cae0206f3a8cd6d9bb22e45c3d7
Merge branch 'devel/master' into tizen

Change-Id: Id6c15bc1aa2b37eb582c6c6246079517d7044b25