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)
commit9204f87e8e3e41cd80c615b64615474b74f56304
treeafd9d249d3a9569eee490acd4e1d3ab573668a1e
parent3635bd8d8aa1053113c3a9b60d924fc663edad1c
parent4b524cd9449699e546a0991326d12ee2c915fab3
Merge branch 'upstream' into tizen

Change-Id: I097f80ba89eb489e040fb8c02c0fdbef57e0a5dc