Merge remote-tracking branch 'remotes/origin/upstream/1.6' into tizen 33/52633/1
authorHyunjun Ko <zzoon.ko@samsung.com>
Wed, 25 Nov 2015 08:20:05 +0000 (17:20 +0900)
committerHyunjun Ko <zzoon.ko@samsung.com>
Wed, 25 Nov 2015 08:22:22 +0000 (17:22 +0900)
Change-Id: I8bae2c3af00cd2a17df9573de016d9b3695c8a02


Trivial merge