Merge branch 'devel/master' into tizen 51/66451/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:44:48 +0000 (13:44 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:46:07 +0000 (13:46 +0900)
commit55862ab4435482fce831bf9daaadc149b549c6f3
tree99ad580861a4e1d80fecefabb210e702c71c5e07
parentb521075f6aa654878522c02e3b1a903daf7c4751
parentc6832d01040b1405eec8b7082e47fc21e9a340b9
Merge branch 'devel/master' into tizen

Change-Id: I4433f83ec6790b8e2804c868b3aeb1b3e3198c15