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)
Change-Id: Ia295154d2b5ff3ad93d213160f5f3f6e3dc7505a


Trivial merge