Merge branch 'upstream' into tizen 13/50913/1
authorYoungbok Shin <youngb.shin@samsung.com>
Tue, 3 Nov 2015 12:06:50 +0000 (21:06 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Tue, 3 Nov 2015 12:07:33 +0000 (21:07 +0900)
Change-Id: I097f80ba89eb489e040fb8c02c0fdbef57e0a5dc


Trivial merge