Merge branch 'devel/master (1.2.0)' into tizen 08/83208/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:32:48 +0000 (20:32 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:34:01 +0000 (20:34 +0900)
commit9851bf19ae796af52a397dd19c234b91999cb1cb
tree9fe63180620189861c2d2b523f33e3b14715b231
parentb77a95ecbb2ef80effd6552a7c3c957c9f6581e8
parent707333599e29423db3bf26b945f35bb3070897e0
Merge branch 'devel/master (1.2.0)' into tizen

Change-Id: Iafdbae903af3374dd58d83353a3af69da3b6da04