Merge branch 'tizen' into tizen_3.0 82/97282/1
authortaeyoung <ty317.kim@samsung.com>
Sat, 12 Nov 2016 10:03:05 +0000 (19:03 +0900)
committertaeyoung <ty317.kim@samsung.com>
Sat, 12 Nov 2016 10:03:05 +0000 (19:03 +0900)
commit9e4f93b40cbff8a023cdf8b2e61c234356ae9574
treeb738825e9fe070641f279a7c05d5d44b36318463
parent41f1d655807502f88027873a4509a50180fb1196
parent2f27eb7e492ab85a143abc0b2ba863565395f6f4
Merge branch 'tizen' into tizen_3.0

Signed-off-by: taeyoung <ty317.kim@samsung.com>
Change-Id: I2f4fb4820ff3ac83427f381dc0d57ff85782443f