Merge branch 'upstream' into tizen 78/50878/1
authorJaeun Choi <jaeun12.choi@samsung.com>
Wed, 28 Oct 2015 08:21:14 +0000 (17:21 +0900)
committerJaeun Choi <jaeun12.choi@samsung.com>
Wed, 28 Oct 2015 08:21:14 +0000 (17:21 +0900)
commitf6842f9706cf21b57e973aff0f95c13ec1f92b6d
treefc61e2dc4ca9ab2f8052c0b8a955d98b7bc7a5a2
parent682bd55af5cb3a3bf516bb027f0c014561de3478
parentdb1af30227cdcd1e5ea6c83fb96fb06679a58a0a
Merge branch 'upstream' into tizen

Change-Id: Ia295154d2b5ff3ad93d213160f5f3f6e3dc7505a